From: Frank Li Date: Mon, 23 Feb 2009 08:02:43 +0000 (+0800) Subject: Update Document X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=758c8308f0864be57ee2186eb54c4db3131e0ea4 Update Document --- diff --git a/doc/API/DoxyfileSVN b/doc/API/DoxyfileSVN index fde1b85..bdf9180 100644 --- a/doc/API/DoxyfileSVN +++ b/doc/API/DoxyfileSVN @@ -17,7 +17,7 @@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = Subversion +PROJECT_NAME = Git # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or @@ -339,7 +339,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ..\ext\Subversion\subversion/include +INPUT = ..\ext\Git\Git/include # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -527,7 +527,7 @@ GENERATE_HTMLHELP = YES # can add a path in front of the file if the result should not be # written to the html output dir. -CHM_FILE = SubversionAPI.chm +CHM_FILE = GitAPI.chm # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag # controls if a separate .chi index file is generated (YES) or that diff --git a/doc/Aspell/TortoiseSVN.tmpl.pws b/doc/Aspell/TortoiseSVN.tmpl.pws index 50b1450..51dfaa1 100644 --- a/doc/Aspell/TortoiseSVN.tmpl.pws +++ b/doc/Aspell/TortoiseSVN.tmpl.pws @@ -63,7 +63,7 @@ ssl sspi stdout stderr -Subversion +Git SubWCRev svn svnserve diff --git a/doc/Screenshots.txt b/doc/Screenshots.txt index 7306605..ebb8eff 100644 --- a/doc/Screenshots.txt +++ b/doc/Screenshots.txt @@ -45,13 +45,13 @@ Instructions for each screenshot Authenticate.png You will have to clear authentication to make this one appear. Do this temporarily for the TSVN repo by renaming - [Application Data]\Subversion\auth\svn.simple\f55fc06b366775f8c026407285be8070 + [Application Data]\Git\auth\svn.simple\f55fc06b366775f8c026407285be8070 BlameDialog.png Blame any file ch02dia1-7.png - These are 'borrowed' from the Subversion Book + These are 'borrowed' from the Git Book Changelist.png Use the 'doc' test WC. @@ -189,12 +189,12 @@ MergeConflictCallback.png This should generate a conflict and bring up the callback. mergeprinciple.png - Borrowed from the Subversion docs + Borrowed from the Git docs Properties.png Right click on the TSVN doc folder and open Explorer properties (not TSVN properties). - Capture the Subversion tab + Capture the Git tab PropertyAdd.png For any versioned folder, TSVN->Properties diff --git a/doc/build-zh_CN.txt b/doc/build-zh_CN.txt index b1cb02f..68bc8e9 100644 --- a/doc/build-zh_CN.txt +++ b/doc/build-zh_CN.txt @@ -6,7 +6,7 @@ A. 你需要 VS.NET2005 (或者至少 Visual C++ .NET 2005) 构建全部 Tortoi Applications”。 B. 如果没有 VS.NET，你可以下载免费的 Visual C++ 2005 Express。它只能构建 - Subversion 库，SubWCRev，TortoiseBlame 和 TortoiseIDiff 程序。 + Git 库，SubWCRev，TortoiseBlame 和 TortoiseIDiff 程序。 - 安装 Visual C++ 2005 Express 版本。 下载地址: http://msdn.microsoft.com/vstudio/express/visualc/ - 安装 Microsoft Platform SDK，版本是 Windows Server 2003 SP1 @@ -55,7 +55,7 @@ C. 如果你计划构建 64 位软件包，请安装软件包 - 将 dictionaries/thesauri 复制到 “common\spell”。 注意文件名称很重要!必须为 en_US.aff，en_US.dic，en_GB.aff 和 en_GB.dic (或者你使用的其它语言)。 警告: 只支持词典格式 OO2。早期版本会让 TortoiseSVN 崩溃! -- 从 Subversion 版本库将 TortoiseSVN 源代码检出到目录 SVN\TortoiseSVN。 +- 从 Git 版本库将 TortoiseSVN 源代码检出到目录 SVN\TortoiseSVN。 - 解压文件 “tools.zip”，建议目录是 “SVN\TortoiseSVN\Tools”。 注视: 目录 tools 的路径不能包含特殊字符或空格。如果你将TortoiseSVN 源代码 检出到这样的位置，你可以将目录 tools 存放到其它合适的位置。 @@ -101,11 +101,11 @@ C. 如果你计划构建 64 位软件包，请安装软件包 > nant setup 会编译一切，板含文档和语言包，创建 msi 安装程序 - 注意: 当构建脚本编译 Subversion 时，你可能看到一些编译错误，例如: + 注意: 当构建脚本编译 Git 时，你可能看到一些编译错误，例如: > error C2065: 'SVN_FS_WANT_DB_MAJOR' : undeclared identifier > error C2065: 'SVN_FS_WANT_DB_MINOR' : undeclared identifier > error C2065: 'SVN_FS_WANT_DB_PATCH' : undeclared identifier - 这是正常的，无须担忧。这些错误的原因是 TortoiseSVN 构建两次 Subversion 库。 + 这是正常的，无须担忧。这些错误的原因是 TortoiseSVN 构建两次 Git 库。 一次构建所有 RA 访问层和所有库，另一次没有这些构建。这些错误在 “原始” 构建 中出现，但是这些库不在此构建中使用。当然，构建脚本可以调整为只构建真正需要 的库，但是与构建全部相比，构建独立的工程并不容易。 @@ -116,8 +116,8 @@ C. 如果你计划构建 64 位软件包，请安装软件包 - 现在你需要构建 Subversion 库: - > nant Subversion + 现在你需要构建 Git 库: + > nant Git 注意 VC Express 编译器在后台工作，没有控制台窗口。它有大量的磁盘操作，但是在 Nant 控制台窗口没有结果显示。请耐心等候! diff --git a/doc/doc.build b/doc/doc.build index 1b8b6ca..cbe8285 100644 --- a/doc/doc.build +++ b/doc/doc.build @@ -521,17 +521,17 @@ All user/site specific configuration is stored in doc.build.user. - + - - - + + + - + diff --git a/doc/images/en/TortoiseGit_logo_hor468x64.png b/doc/images/en/TortoiseGit_logo_hor468x64.png index 05f7b01..357057b 100644 Binary files a/doc/images/en/TortoiseGit_logo_hor468x64.png and b/doc/images/en/TortoiseGit_logo_hor468x64.png differ diff --git a/doc/issuetrackers.txt b/doc/issuetrackers.txt index a8d83d1..7952147 100644 --- a/doc/issuetrackers.txt +++ b/doc/issuetrackers.txt @@ -1,10 +1,10 @@ -Integration of Subversion (GUI) clients with Bug Tracking Tools: +Integration of Git (GUI) clients with Bug Tracking Tools: ================================================================================ I. Preface ========== This document is primarily intended for writers of various GUI clients for -Subversion. Clients such as TortoiseSVN, Subclipse, RapidSVN, PySVN and many +Git. Clients such as TortoiseSVN, Subclipse, RapidSVN, PySVN and many others. The goal of this document is to outline a common technique for defining and then @@ -14,17 +14,17 @@ II. Introduction ================ It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems would like to associate -the changes they make in Subversion with a specific ID in their bug tracking +the changes they make in Git with a specific ID in their bug tracking system. There are already a number of people that have integrated these systems -with Subversion. They typically rely on the end user entering a log message on +with Git. They typically rely on the end user entering a log message on their commits in some kind of a specific format that can be parsed with a commit-hook or in some cases just on-the-fly in a web-based presentation of the commit info. This option is OK, but it is not very user-friendly and it places -all of the integration within the bug tracking tool. When using a Subversion +all of the integration within the bug tracking tool. When using a Git client, you can see the log message info, but there is no way to jump to the bug system. -Subversion (GUI) clients can help both the users and the bug tracking tools in +Git (GUI) clients can help both the users and the bug tracking tools in that task: - When the user enters a log message, a well defined line including the issue @@ -40,7 +40,7 @@ the webbrowser to see the issue associated with that log message/commit. III. Requirements ================= -To make the integration with bug tracking tools possible, a Subversion client +To make the integration with bug tracking tools possible, a Git client needs some information about the bug tracking tool used in a project. That information should be available inside the working copy so that clients don't have to access the repository over a possibly very slow connection to get that @@ -53,7 +53,7 @@ The information a client needs is: bug tracking tool can recognize it. Or - a regular expression to parse the log message with to extract the issue number -There are other things a Subversion (GUI) client could use to make the +There are other things a Git (GUI) client could use to make the integration with bug tracking tools easier for the user, but these are essential for the integration to work. @@ -82,7 +82,7 @@ showing the logmessage of a revision. To allow relative URLs, the following formats can be used (subset of the svn:external relative urls): ^/ relative to the repository root. Since issue trackers can not reside - below a subversion repository, the URL must contain navigations. + below a Git repository, the URL must contain navigations. For example: ^/../../issues/id?123 / relative to the server's hostname --------- @@ -192,10 +192,10 @@ Please note: A. FAQ ====== -Q: Why is the integration with bug tracking tools not defined by the Subversion +Q: Why is the integration with bug tracking tools not defined by the Git project? -A: The Subversion developers want to keep Subversion "clean", i.e. they - concentrate on Subversions basic tasks. +A: The Git developers want to keep Git "clean", i.e. they + concentrate on Gits basic tasks. Q: Why don't you use a config file located on the server or revision properties instead of folder properties? @@ -206,7 +206,7 @@ A: A config file located on the server and revision properties would mean that Q: Isn't there a way to store the data in the repository, but having it also stored in the working copy? -A: Subversion doesn't provide such a feature (yet). And there's no way to be +A: Git doesn't provide such a feature (yet). And there's no way to be sure that there ever will be such a feature. So we have to make use of that what's already available. Also, if the properties are set for each folder, then you can assign a diff --git a/doc/po/TortoiseMerge.pot b/doc/po/TortoiseMerge.pot index 68775d8..aff0353 100644 --- a/doc/po/TortoiseMerge.pot +++ b/doc/po/TortoiseMerge.pot @@ -197,7 +197,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:198 #.(para) -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." msgstr "" #: ../source/TortoiseMerge_en.xml:206 @@ -219,7 +219,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:220 #.(para) -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." msgstr "" #: ../source/TortoiseMerge_en.xml:235 @@ -244,7 +244,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:268 #.(para) -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." msgstr "" #: ../source/TortoiseMerge_en.xml:276 @@ -259,7 +259,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:288 #.(para) -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." msgstr "" #: ../source/TortoiseMerge_en.xml:294 @@ -333,7 +333,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:370 #.(para) -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." msgstr "" #: ../source/TortoiseMerge_en.xml:380 @@ -435,7 +435,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:493 #.(para) -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." msgstr "" #: ../source/TortoiseMerge_en.xml:504 @@ -635,7 +635,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:796 #.(para) -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." msgstr "" #: ../source/TortoiseMerge_en.xml:804 @@ -685,7 +685,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:873 #.(para) -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" msgstr "" #: ../source/TortoiseMerge_en.xml:884 @@ -730,7 +730,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:919 #.(para) -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." msgstr "" #: ../source/TortoiseMerge_en.xml:924 @@ -1225,7 +1225,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1360 #.(para) -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "" #: ../source/TortoiseMerge_en.xml:1368 @@ -1265,7 +1265,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1402 #.(para) -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "" #: ../source/TortoiseMerge_en.xml:1415 @@ -1275,7 +1275,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1417 #.(para) -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "" #: ../source/TortoiseMerge_en.xml:1424 @@ -1285,7 +1285,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1426 #.(para) -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "" #: ../source/TortoiseMerge_en.xml:1441 @@ -1295,7 +1295,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1443 #.(para) -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "" #: ../source/TortoiseMerge_en.xml:1451 @@ -1305,7 +1305,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1453 #.(para) -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "" #: ../source/TortoiseMerge_en.xml:1463 @@ -1315,7 +1315,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1465 #.(para) -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "" #: ../source/TortoiseMerge_en.xml:1475 @@ -1355,7 +1355,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1508 #.(para) -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "" #: ../source/TortoiseMerge_en.xml:1515 @@ -1385,7 +1385,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1533 #.(para) -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "" #: ../source/TortoiseMerge_en.xml:1540 @@ -1440,7 +1440,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1586 #.(para) -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "" #: ../source/TortoiseMerge_en.xml:1599 @@ -1450,7 +1450,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1601 #.(para) -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "" #: ../source/TortoiseMerge_en.xml:1614 @@ -1495,7 +1495,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1656 #.(para) -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "" #: ../source/TortoiseMerge_en.xml:1665 @@ -1530,12 +1530,12 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1697 #.(para) -msgid "A frequently-used abbreviation for Subversion." +msgid "A frequently-used abbreviation for Git." msgstr "" #: ../source/TortoiseMerge_en.xml:1700 #.(para) -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "" #: ../source/TortoiseMerge_en.xml:1707 @@ -1555,7 +1555,7 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:1723 #.(para) -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "" #: ../source/TortoiseMerge_en.xml:1731 diff --git a/doc/po/TortoiseMerge_de.po b/doc/po/TortoiseMerge_de.po index 2ff5205..21dd58b 100644 --- a/doc/po/TortoiseMerge_de.po +++ b/doc/po/TortoiseMerge_de.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2008-11-17 15:29+0100\n" "Last-Translator: Lübbe Onken \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -220,8 +220,8 @@ msgstr "Wenn Sie mit Textdateien, z.B. Quelltexten ihrer bevorzugten Programmier #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "Wenn Sie mit einem Versionskontrollsystem arbeiten (z.B. Subversion) dann werden Sie manchmal einen Konflikt erhalten, wenn Sie ihre Arbeitskopie aktualisieren. Dies passiert wenn jemand anders dieselben Stellen derselben Datei geändert hat wie Sie. Dann müssen Sie diesen Konflikt von Hand wieder auflösen. Und TortoiseMerge hilft Ihnen dabei." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "Wenn Sie mit einem Versionskontrollsystem arbeiten (z.B. Git) dann werden Sie manchmal einen Konflikt erhalten, wenn Sie ihre Arbeitskopie aktualisieren. Dies passiert wenn jemand anders dieselben Stellen derselben Datei geändert hat wie Sie. Dann müssen Sie diesen Konflikt von Hand wieder auflösen. Und TortoiseMerge hilft Ihnen dabei." #. (para) #: ../source/TortoiseMerge_en.xml:206 @@ -242,8 +242,8 @@ msgstr "Ein Konflikt kann auch auftreten, wenn Sie versuchen eine veraltete Patc #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "Aber mit TortoiseMerge ist das jetzt kein Problem mehr, zumindest nicht, wenn Sie mit einem Versionskontrollsystem wie Subversion arbeiten. TortoiseMerge untersucht die Patchdatei nach Versionsinformationen, also der Revision/Version, in der diese Datei erstellt wurde und versucht dann genau diese Version der Datei zu holen. Danach wird die Patchdatei angewendet und eventuelle Konflikte angezeigt, die Sie dann bequem mit TortoiseMerge auflösen können." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "Aber mit TortoiseMerge ist das jetzt kein Problem mehr, zumindest nicht, wenn Sie mit einem Versionskontrollsystem wie Git arbeiten. TortoiseMerge untersucht die Patchdatei nach Versionsinformationen, also der Revision/Version, in der diese Datei erstellt wurde und versucht dann genau diese Version der Datei zu holen. Danach wird die Patchdatei angewendet und eventuelle Konflikte angezeigt, die Sie dann bequem mit TortoiseMerge auflösen können." #. (title) #: ../source/TortoiseMerge_en.xml:235 @@ -267,8 +267,8 @@ msgstr "Also haben wir viel Zeit damit verbracht, das Internet nach einem guten #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "Da TortoiseGit schon die Subversion Bibliothek benutzt welche gute Vergleichsfunktionen enthält, war es nur natürlich, dieselbe Funktionsbibliothek anstelle von GNU Diff für TortoiseMerge zu nutzen." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "Da TortoiseGit schon die Git Bibliothek benutzt welche gute Vergleichsfunktionen enthält, war es nur natürlich, dieselbe Funktionsbibliothek anstelle von GNU Diff für TortoiseMerge zu nutzen." #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -282,8 +282,8 @@ msgstr "Anzeigen von Unterschieden zwischen zwei Dateien, Zusammenführen von ge #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." -msgstr "Bearbeiten von Konflikten zwischen lokalen Änderungen und dem Subversion Projektarchiv in Folge einer Aktualisierung." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." +msgstr "Bearbeiten von Konflikten zwischen lokalen Änderungen und dem Git Projektarchiv in Folge einer Aktualisierung." #. (para) #: ../source/TortoiseMerge_en.xml:294 @@ -356,8 +356,8 @@ msgstr "Patches Anwenden" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." -msgstr "Ein Patch ist eine Datei im Subversion Standard-Diff Format, die die Informationen über Änderungen an einem Satz von Dateien enthält. Der Patch kann von einem anderen Entwickler stammen, so dass Sie seine Änderungen anwenden, überprüfen und gegebenenfalls in das Projektarchiv übertragen können. Die Patchdatei kann auch intern durch TortoiseGit beim Vergleich zweier Ordner generiert werden. Dies geschieht zum Beispiel wenn Sie eine Revision im Projektarchiv mit der Arbeitskopie oder auch zwei Revisionen im Projektarchiv oder zwei verschiedene Pfade im Projektarchiv miteinander vergleichen." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgstr "Ein Patch ist eine Datei im Git Standard-Diff Format, die die Informationen über Änderungen an einem Satz von Dateien enthält. Der Patch kann von einem anderen Entwickler stammen, so dass Sie seine Änderungen anwenden, überprüfen und gegebenenfalls in das Projektarchiv übertragen können. Die Patchdatei kann auch intern durch TortoiseGit beim Vergleich zweier Ordner generiert werden. Dies geschieht zum Beispiel wenn Sie eine Revision im Projektarchiv mit der Arbeitskopie oder auch zwei Revisionen im Projektarchiv oder zwei verschiedene Pfade im Projektarchiv miteinander vergleichen." #. (para) #: ../source/TortoiseMerge_en.xml:380 @@ -458,8 +458,8 @@ msgstr "Nachdem TortoiseMerge die Patchdatei eingelesen hat, wird ein kleines Di #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "Aber keine Sorge. Wenn Sie mit Subversion arbeiten können Sie die benötigte Dateiversion zurückholen, um den Konflikt aufzulösen. Tatsächlich erledigt TortoiseMerge dies im Hintergrund, holt die benötigte Dateiversion, fügt die Änderungen der Patchdatei hinzu und zeigt Ihnen dann in der Dreifenstersicht, die Basis (alte Version zu welcher der Patch gehört), Meiner (die Datei in Ihrer Arbeitskopie) und Deren (die Basisdatei mit dem Patch). Damit können Sie eventuelle Konflikte von Hand auflösen." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "Aber keine Sorge. Wenn Sie mit Git arbeiten können Sie die benötigte Dateiversion zurückholen, um den Konflikt aufzulösen. Tatsächlich erledigt TortoiseMerge dies im Hintergrund, holt die benötigte Dateiversion, fügt die Änderungen der Patchdatei hinzu und zeigt Ihnen dann in der Dreifenstersicht, die Basis (alte Version zu welcher der Patch gehört), Meiner (die Datei in Ihrer Arbeitskopie) und Deren (die Basisdatei mit dem Patch). Damit können Sie eventuelle Konflikte von Hand auflösen." #. (para) #: ../source/TortoiseMerge_en.xml:504 @@ -658,8 +658,8 @@ msgstr "Wenn Sie einen Dreiwegevergleich durchführen (auch Zusammenf #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." -msgstr "Manchmal wird in Subversion ein Dateikonflikt angezeigt, es sind jedoch keine Unterschiede sichtbar, wenn Sie die Datei in TortoiseMerge betrachten. Das kann an ihren Einstellungen für den Vergleich von Leerzeichen oder Zeilenumbrüchen liegen. Falls Sie beschlossen haben, solche Änderungen zu ignorieren, werden die entsprechenden Zeilen durch das Konflikt Ignoriert Symbol gekennzeichnet. Um den Konflikt aufzulösen müssen Sie trotzdem eine der beiden Varianten auswählen." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgstr "Manchmal wird in Git ein Dateikonflikt angezeigt, es sind jedoch keine Unterschiede sichtbar, wenn Sie die Datei in TortoiseMerge betrachten. Das kann an ihren Einstellungen für den Vergleich von Leerzeichen oder Zeilenumbrüchen liegen. Falls Sie beschlossen haben, solche Änderungen zu ignorieren, werden die entsprechenden Zeilen durch das Konflikt Ignoriert Symbol gekennzeichnet. Um den Konflikt aufzulösen müssen Sie trotzdem eine der beiden Varianten auswählen." #. (para) #: ../source/TortoiseMerge_en.xml:804 @@ -708,8 +708,8 @@ msgstr "Wenn Sie eine Patchdatei anwenden möchten, müssen Sie sowohl die Patch #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" -msgstr "Zur Zeit können nur Patchdateien im Standard-Diff Format angewendet werden. Und auch nur solche, welche mittels einem Subversion Client erstellt wurden. Andere Formate wie zum Beispiel Patchdateien, die von CVS Programmen erstellt wurden, werden nicht unterstützt!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" +msgstr "Zur Zeit können nur Patchdateien im Standard-Diff Format angewendet werden. Und auch nur solche, welche mittels einem Git Client erstellt wurden. Andere Formate wie zum Beispiel Patchdateien, die von CVS Programmen erstellt wurden, werden nicht unterstützt!" #. (title) #: ../source/TortoiseMerge_en.xml:884 @@ -753,8 +753,8 @@ msgstr "Änderungen in Zeile farbig hervorheben verwendet d #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "Vergleiche Leerzeichen hebt alle Änderungen in Leerzeichen und Einrückung als gelöschte / hinzugefügte Zeilen hervor (Subversion behandelt Änderungen in Leerzeichen so)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "Vergleiche Leerzeichen hebt alle Änderungen in Leerzeichen und Einrückung als gelöschte / hinzugefügte Zeilen hervor (Git behandelt Änderungen in Leerzeichen so)." #. (para) #: ../source/TortoiseMerge_en.xml:924 @@ -1259,8 +1259,8 @@ msgstr "Hinzufügen" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Ein Subversion Befehl, der zum Hinzufügen von Dateien oder Ordnern zu einem Projektarchiv benutzt wird. Die neuen Objekte werden beim Übertragen zum Projektarchiv hinzugefügt." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Ein Git Befehl, der zum Hinzufügen von Dateien oder Ordnern zu einem Projektarchiv benutzt wird. Die neuen Objekte werden beim Übertragen zum Projektarchiv hinzugefügt." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1368 @@ -1290,7 +1290,7 @@ msgstr "BDB" #. (para) #: ../source/TortoiseMerge_en.xml:1393 msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." -msgstr "Berkeley DB. Ein bewährtes Datenbanksystem für Projektarchive. Kann nicht über Netzwerkfreigaben genutzt werden. Standard für Projektarchive von Subversion vor Version 1.2." +msgstr "Berkeley DB. Ein bewährtes Datenbanksystem für Projektarchive. Kann nicht über Netzwerkfreigaben genutzt werden. Standard für Projektarchive von Git vor Version 1.2." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1400 @@ -1299,8 +1299,8 @@ msgstr "Verzweigen" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Ein Begriff der häufig in Versionskontrollsystemen verwendet wird, um zu beschreiben, wenn sich die Entwicklung an einem bestimmten Punkt verzweigt und verschiedenen Wegen folgt. Sie können von der Hauptentwicklungslinie abzweigen, um neue Funktionen zu implementieren ohne den Hauptzweig instabil zu machen. Genauso können Sie eine stabile, freigegebene Version abzweigen, an der Sie nur noch Fehler beseitigen, während die Weiterentwicklung am instabilen Hauptzweig erfolgt. In Subversion sind Zweige als billige Kopien implementiert." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Ein Begriff der häufig in Versionskontrollsystemen verwendet wird, um zu beschreiben, wenn sich die Entwicklung an einem bestimmten Punkt verzweigt und verschiedenen Wegen folgt. Sie können von der Hauptentwicklungslinie abzweigen, um neue Funktionen zu implementieren ohne den Hauptzweig instabil zu machen. Genauso können Sie eine stabile, freigegebene Version abzweigen, an der Sie nur noch Fehler beseitigen, während die Weiterentwicklung am instabilen Hauptzweig erfolgt. In Git sind Zweige als billige Kopien implementiert." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 @@ -1309,8 +1309,8 @@ msgstr "Auschecken" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Ein Subversionbefehl, der eine lokale Arbeitskopie in einem leeren Verzeichnis erstellt, indem versionierte Dateien aus einem Projektarchiv heruntergeladen werden." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Ein Gitbefehl, der eine lokale Arbeitskopie in einem leeren Verzeichnis erstellt, indem versionierte Dateien aus einem Projektarchiv heruntergeladen werden." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1424 @@ -1319,8 +1319,8 @@ msgstr "Bereinigen" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Ein Zitat aus dem Subversion Buch: Räumt die Arbeitskopie rekursiv auf, entfernt dabei Sperren und setzt unvollendete Operationen fort. Wenn Sie jemals einen Arbeitskopie gesperrt Fehler bekommen, führen Sie diesen Befehl aus, um veraltete Sperren zu entfernen und Ihre Arbeitskopie wieder in einen nutzbaren Zustand zu versetzen. Beachten Sie, dass in diesem Zusammenhang Sperren lokale Dateisystemsperren bezeichnet und keine Sperren im Projektarchiv." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Ein Zitat aus dem Git Buch: Räumt die Arbeitskopie rekursiv auf, entfernt dabei Sperren und setzt unvollendete Operationen fort. Wenn Sie jemals einen Arbeitskopie gesperrt Fehler bekommen, führen Sie diesen Befehl aus, um veraltete Sperren zu entfernen und Ihre Arbeitskopie wieder in einen nutzbaren Zustand zu versetzen. Beachten Sie, dass in diesem Zusammenhang Sperren lokale Dateisystemsperren bezeichnet und keine Sperren im Projektarchiv." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1441 @@ -1329,8 +1329,8 @@ msgstr "Übertragen" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Dieser Subversionbefehl wird verwendet, um die Änderungen in Ihrer lokalen Arbeitskopie zurück in das Projektarchiv zu übertragen." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Dieser Gitbefehl wird verwendet, um die Änderungen in Ihrer lokalen Arbeitskopie zurück in das Projektarchiv zu übertragen." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1451 @@ -1339,8 +1339,8 @@ msgstr "Konflikt" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Wenn Änderungen vom Projektarchiv mit den lokalen Änderungen zusammengeführt werden sollen, kann es vorkommen dass diese Änderungen in den selben Zeilen der Datei auftreten. In diesem Fall kann Subversion nicht selbst entscheiden welche Version zu verwenden ist und die Datei wird somit als \"in Konflikt\" markiert. Sie müssen die Datei von Hand editieren und den Konflikt auflösen, bevor Sie weitere Änderungen übertragen können." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Wenn Änderungen vom Projektarchiv mit den lokalen Änderungen zusammengeführt werden sollen, kann es vorkommen dass diese Änderungen in den selben Zeilen der Datei auftreten. In diesem Fall kann Git nicht selbst entscheiden welche Version zu verwenden ist und die Datei wird somit als \"in Konflikt\" markiert. Sie müssen die Datei von Hand editieren und den Konflikt auflösen, bevor Sie weitere Änderungen übertragen können." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1463 @@ -1349,8 +1349,8 @@ msgstr "Kopieren" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "In einem Subversion Projektarchiv können Sie eine Kopie einer einzelnen Datei oder eines ganzen Baumes erstellen. Diese sind als billige Kopien in Form eines Verweises auf das Original implementiert. Somit benötigt selbst die Kopie eines Dateibaumes fast keinen Platz. Eine Kopie behält die Historie ihrer Vorgänger, so dass auch Log-Meldungen über die Kopie hinaus verfolgt werden können." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "In einem Git Projektarchiv können Sie eine Kopie einer einzelnen Datei oder eines ganzen Baumes erstellen. Diese sind als billige Kopien in Form eines Verweises auf das Original implementiert. Somit benötigt selbst die Kopie eines Dateibaumes fast keinen Platz. Eine Kopie behält die Historie ihrer Vorgänger, so dass auch Log-Meldungen über die Kopie hinaus verfolgt werden können." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1475 @@ -1389,8 +1389,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Ein proprietäres Subversion-Dateisystem für Projektarchive. Kann über Netzwerkfreigaben genutzt werden. Seit Version 1.2 Standard für neue Projektarchive." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Ein proprietäres Git-Dateisystem für Projektarchive. Kann über Netzwerkfreigaben genutzt werden. Seit Version 1.2 Standard für neue Projektarchive." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1515 @@ -1419,8 +1419,8 @@ msgstr "Importieren" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Ein Subversionbefehl mit dem eine vollständige Ordnerhierarchie mit einer einzigen Revision in ein Projektarchiv importiert wird." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Ein Gitbefehl mit dem eine vollständige Ordnerhierarchie mit einer einzigen Revision in ein Projektarchiv importiert wird." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1540 @@ -1474,8 +1474,8 @@ msgstr "Patch" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Wenn eine Arbeitskopie nur Änderungen an Textdateien aufweist, ist es möglich mit dem Diff-Befehl von Subversion eine Datei zu erstellen, welche diese Änderungen im Unified Diff Format enthält. Eine Datei mit solchem Inhalt wird üblicherweise als Patch bezeichnet und kann zum Beispiel jemand anderem per Mail geschickt werden, der diese Änderungen dann in seine Arbeitskopie übernehmen kann. Jemand ohne Übertragungsrechte zum Projektarchiv kann so Änderungen vornehmen, diese Änderungen an eine Person mit Übertragungsrechten schicken, welche dann diese Änderungen übertragen kann. Oder man kann eine solche Patchdatei anderen zuerst zur Diskussion schicken, bevor man die Änderungen überträgt." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Wenn eine Arbeitskopie nur Änderungen an Textdateien aufweist, ist es möglich mit dem Diff-Befehl von Git eine Datei zu erstellen, welche diese Änderungen im Unified Diff Format enthält. Eine Datei mit solchem Inhalt wird üblicherweise als Patch bezeichnet und kann zum Beispiel jemand anderem per Mail geschickt werden, der diese Änderungen dann in seine Arbeitskopie übernehmen kann. Jemand ohne Übertragungsrechte zum Projektarchiv kann so Änderungen vornehmen, diese Änderungen an eine Person mit Übertragungsrechten schicken, welche dann diese Änderungen übertragen kann. Oder man kann eine solche Patchdatei anderen zuerst zur Diskussion schicken, bevor man die Änderungen überträgt." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1599 @@ -1484,8 +1484,8 @@ msgstr "Eigenschaft" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Zusätzlich zur Versionierung von Dateien und Ordnern erlaubt Subversion die Versionierung von Metadaten für Ordner und Dateien, auch als Eigenschaften bezeichnet. Jede Eigenschaft hat einen Namen und einen Wert, ähnlich wie ein Registry-Schlüssel. Subversion selbst hat einige spezielle Eigenschaften definiert, welche intern benutzt werden, wie zum Beispiel svn:eol-style. TortoiseGit nutzt ebenfalls spezielle Eigenschaften, so zum Beispiel tsvn:logminsize. Sie können eigene Eigenschaften mit jedem Namen und Wert erstellen den sie möchten." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Zusätzlich zur Versionierung von Dateien und Ordnern erlaubt Git die Versionierung von Metadaten für Ordner und Dateien, auch als Eigenschaften bezeichnet. Jede Eigenschaft hat einen Namen und einen Wert, ähnlich wie ein Registry-Schlüssel. Git selbst hat einige spezielle Eigenschaften definiert, welche intern benutzt werden, wie zum Beispiel svn:eol-style. TortoiseGit nutzt ebenfalls spezielle Eigenschaften, so zum Beispiel tsvn:logminsize. Sie können eigene Eigenschaften mit jedem Namen und Wert erstellen den sie möchten." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1614 @@ -1529,8 +1529,8 @@ msgstr "Rückgängig" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion hält eine lokale Basis-Kopie von jeder Datei in dem Zustand, in dem sie zuletzt aktualisiert wurde in der Arbeitskopie. Wenn Sie Änderungen gemacht haben und diese rückgängig machen wollen, können Sie den Befehl Rückgängig verwenden, um zurück zur Basisversion der Datei zu kommen." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git hält eine lokale Basis-Kopie von jeder Datei in dem Zustand, in dem sie zuletzt aktualisiert wurde in der Arbeitskopie. Wenn Sie Änderungen gemacht haben und diese rückgängig machen wollen, können Sie den Befehl Rückgängig verwenden, um zurück zur Basisversion der Datei zu kommen." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1665 @@ -1564,12 +1564,12 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Eine häufig verwendete Abkürzung für Subversion" +msgid "A frequently-used abbreviation for Git." +msgstr "Eine häufig verwendete Abkürzung für Git" #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "Der Name des spezifischen Protokolls, das von svnserve genutzt wird." #. (glossterm) @@ -1589,8 +1589,8 @@ msgstr "Aktualisieren" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Dieser Subversionbefehl holt die neuesten Änderungen aus dem Projektarchiv in Ihre Arbeitskopie und führt dabei die Änderungen von anderen mit Ihren Änderungen zusammen." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Dieser Gitbefehl holt die neuesten Änderungen aus dem Projektarchiv in Ihre Arbeitskopie und führt dabei die Änderungen von anderen mit Ihren Änderungen zusammen." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1731 diff --git a/doc/po/TortoiseMerge_es.po b/doc/po/TortoiseMerge_es.po index 8955a9e..fba9e04 100644 --- a/doc/po/TortoiseMerge_es.po +++ b/doc/po/TortoiseMerge_es.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2008-12-05 18:57+0100\n" "Last-Translator: Fernando P. Nájera Cano \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -211,8 +211,8 @@ msgstr "Mientras trabaja con ficheros de texto, por ejemplo ficheros de código #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "Si está trabajando con un sistema de control de versiones (por ejemplo Subversion) a veces obtendrá conflictos cuando actualice su copia de trabajo. Esto ocurre si alguien ha modificado las mismas partes que usted del fichero en el que está trabajando. En esos casos tendrá que resolver esos conflictos manualmente. Aquí es donde TortoiseMerge puede ayudarle." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "Si está trabajando con un sistema de control de versiones (por ejemplo Git) a veces obtendrá conflictos cuando actualice su copia de trabajo. Esto ocurre si alguien ha modificado las mismas partes que usted del fichero en el que está trabajando. En esos casos tendrá que resolver esos conflictos manualmente. Aquí es donde TortoiseMerge puede ayudarle." #. (para) #: ../source/TortoiseMerge_en.xml:206 @@ -233,8 +233,8 @@ msgstr "Un conflicto también puede ocurrir si intenta aplicar un parche desactu #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "Pero ahora con TortoiseMerge ya no es necesario hacer eso - al menos no si está trabajando con un sistema de control de versiones como Subversion. TortoiseMerge parsea el fichero de parche buscando la revisión/versión sobre la que se creó el parche y automáticamente intenta obtener esa versión específica de su control de código. Luego aplica el parche y le deja revisar tanto los cambios de usted en el fichero como los de los otros. Luego puede decidir qué cambios desea mantener." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "Pero ahora con TortoiseMerge ya no es necesario hacer eso - al menos no si está trabajando con un sistema de control de versiones como Git. TortoiseMerge parsea el fichero de parche buscando la revisión/versión sobre la que se creó el parche y automáticamente intenta obtener esa versión específica de su control de código. Luego aplica el parche y le deja revisar tanto los cambios de usted en el fichero como los de los otros. Luego puede decidir qué cambios desea mantener." #. (title) #: ../source/TortoiseMerge_en.xml:235 @@ -258,8 +258,8 @@ msgstr "Así que gastamos mucho tiempo buscando en internet una herramienta GUI #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "Dado que TortoiseGit ya utiliza la librería de Subversion, que contiene un buen motor de diferencias, era natural que utilizáramos esa librería en vez del diff de GNU." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "Dado que TortoiseGit ya utiliza la librería de Git, que contiene un buen motor de diferencias, era natural que utilizáramos esa librería en vez del diff de GNU." #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -273,8 +273,8 @@ msgstr "Viendo las diferencias entre dos ficheros y fusionando los cambios en un #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." -msgstr "Editando conflictos entre cambios locales y cambios en el repositorio de Subversion tras una actualización." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." +msgstr "Editando conflictos entre cambios locales y cambios en el repositorio de Git tras una actualización." #. (para) #: ../source/TortoiseMerge_en.xml:294 @@ -347,8 +347,8 @@ msgstr "Aplicando parches" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." -msgstr "Un fichero de parche es un fichero de diff unificado de Subversion, que contiene la información necesaria para aplicar cambios a un conjunto de ficheros. El parche puede haber sido proporcionado por otro desarrollador para que pueda ver sus cambios y posiblemente confirmarlos en el repositorio. O puede haber sido generado internamente por TortoiseGit cuando compara dos carpetas. Esto ocurre cuando compara una revisión del repositorio con una carpeta de copia de trabajo, o si compara dos revisiones diferentes del repositorio, o si compara dos rutas de repositorio diferentes." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgstr "Un fichero de parche es un fichero de diff unificado de Git, que contiene la información necesaria para aplicar cambios a un conjunto de ficheros. El parche puede haber sido proporcionado por otro desarrollador para que pueda ver sus cambios y posiblemente confirmarlos en el repositorio. O puede haber sido generado internamente por TortoiseGit cuando compara dos carpetas. Esto ocurre cuando compara una revisión del repositorio con una carpeta de copia de trabajo, o si compara dos revisiones diferentes del repositorio, o si compara dos rutas de repositorio diferentes." #. (para) #: ../source/TortoiseMerge_en.xml:380 @@ -449,8 +449,8 @@ msgstr "Cuando TortoiseMerge termine de parsear el fichero de parche, le mostrar #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "Pero no se preocupe. Si trabaja con Subversion puede recuperar una versión antigua del fichero y resolver el conflicto. De hecho, TortoiseMerge automáticamente intenta obtener la versión antigua del fichero y le enseña las diferencias entre Base (la versión antigua del fichero), Mío (su fichero tal y como está ahora en su copia de trabajo) y De otros (la versión antigua con el parche ya aplicado). Entonces puede resolver los posibles conflictos manualmente." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "Pero no se preocupe. Si trabaja con Git puede recuperar una versión antigua del fichero y resolver el conflicto. De hecho, TortoiseMerge automáticamente intenta obtener la versión antigua del fichero y le enseña las diferencias entre Base (la versión antigua del fichero), Mío (su fichero tal y como está ahora en su copia de trabajo) y De otros (la versión antigua con el parche ya aplicado). Entonces puede resolver los posibles conflictos manualmente." #. (para) #: ../source/TortoiseMerge_en.xml:504 @@ -649,8 +649,8 @@ msgstr "Si está en la vista de tres paneles (a veces llamada vista de #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." -msgstr "A veces un fichero se marcará como en conflicto en Subversion, pero cuando lo vea utilizando TortoiseMerge no se muestra ningún conflicto. Esto puede ser debido a su selección de la forma en la que se tratan los espacios en blanco. Si elige ignorar los cambios en el fin de línea o en los espacios en blanco, esas líneas se marcarán utilizando el icono Conflicto-Ignorado. Para resolver el conflicto aún necesitará elegir qué versión desea utilizar." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgstr "A veces un fichero se marcará como en conflicto en Git, pero cuando lo vea utilizando TortoiseMerge no se muestra ningún conflicto. Esto puede ser debido a su selección de la forma en la que se tratan los espacios en blanco. Si elige ignorar los cambios en el fin de línea o en los espacios en blanco, esas líneas se marcarán utilizando el icono Conflicto-Ignorado. Para resolver el conflicto aún necesitará elegir qué versión desea utilizar." #. (para) #: ../source/TortoiseMerge_en.xml:804 @@ -699,8 +699,8 @@ msgstr "Si desea aplicar un fichero de parche, tiene que especificar tanto la ru #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" -msgstr "Actualmente, sólo se admiten ficheros de parche en el Formato de Diff Unificado. Y sólo los ficheros que se hayan generado desde una copia de trabajo de Subversion. ¡No se admiten actualmente otros formatos como los ficheros de parche generados por CVS!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" +msgstr "Actualmente, sólo se admiten ficheros de parche en el Formato de Diff Unificado. Y sólo los ficheros que se hayan generado desde una copia de trabajo de Git. ¡No se admiten actualmente otros formatos como los ficheros de parche generados por CVS!" #. (title) #: ../source/TortoiseMerge_en.xml:884 @@ -744,8 +744,8 @@ msgstr "Colorear cambios dentro de las líneas utiliza el m #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "Comparar espacios en blanco muestra todos los cambios en la indentación y en los espacios dentro de las líneas como si fueran líneas añadidas/eliminadas (que es como Subversion trata estos cambios)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "Comparar espacios en blanco muestra todos los cambios en la indentación y en los espacios dentro de las líneas como si fueran líneas añadidas/eliminadas (que es como Git trata estos cambios)." #. (para) #: ../source/TortoiseMerge_en.xml:924 @@ -1251,8 +1251,8 @@ msgstr "Añadir" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Un comando de Subversion que se utiliza para añadir un fichero o un directorio a su copia de trabajo. Los nuevos ítems se añaden al repositorio cuando confirme." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Un comando de Git que se utiliza para añadir un fichero o un directorio a su copia de trabajo. Los nuevos ítems se añaden al repositorio cuando confirme." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1368 @@ -1291,8 +1291,8 @@ msgstr "Rama" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Un término de uso frecuente en los sistemas de control de versiones para describir lo que ocurre cuando el desarrollo se parte en un punto en concreto y sigue dos caminos separados. Puede crear una rama desde la línea principal de desarrollo para desarrollar una nueva funcionalidad sin hacer que la línea principal quede inestable. O puede hacer una rama de una versión estable en la que sólo hará correcciones de errores, mientras los nuevos desarrollos tienen lugar en el inestable tronco. En Subversion una rama se implementa como una copia barata." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Un término de uso frecuente en los sistemas de control de versiones para describir lo que ocurre cuando el desarrollo se parte en un punto en concreto y sigue dos caminos separados. Puede crear una rama desde la línea principal de desarrollo para desarrollar una nueva funcionalidad sin hacer que la línea principal quede inestable. O puede hacer una rama de una versión estable en la que sólo hará correcciones de errores, mientras los nuevos desarrollos tienen lugar en el inestable tronco. En Git una rama se implementa como una copia barata." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 @@ -1301,8 +1301,8 @@ msgstr "Obtener" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Un comando de Subversion que crea una copia local de trabajo en un directorio vacío al descargar los ficheros versionados desde el repositorio." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Un comando de Git que crea una copia local de trabajo en un directorio vacío al descargar los ficheros versionados desde el repositorio." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1424 @@ -1311,8 +1311,8 @@ msgstr "Limpiar" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Citando el libro de Subversion: Limpia recursivamente la copia de trabajo, eliminando los bloqueos y continuando las operaciones sin terminar. Si alguna vez obtiene un error copia de trabajo bloqueada, ejecute este comando para eliminar los bloqueos y conseguir que su copia de trabajo vuelva a un estado usable de nuevo. Tenga en cuenta que en este contexto bloqueado se refiere a un bloqueo del sistema de ficheros local, no a bloqueos del repositorio." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Citando el libro de Git: Limpia recursivamente la copia de trabajo, eliminando los bloqueos y continuando las operaciones sin terminar. Si alguna vez obtiene un error copia de trabajo bloqueada, ejecute este comando para eliminar los bloqueos y conseguir que su copia de trabajo vuelva a un estado usable de nuevo. Tenga en cuenta que en este contexto bloqueado se refiere a un bloqueo del sistema de ficheros local, no a bloqueos del repositorio." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1441 @@ -1321,8 +1321,8 @@ msgstr "Confirmar" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Este comando de Subversion se utiliza para pasar los cambios desde su copia de trabajo local al repositorio, creando una nueva revisión en el repositorio." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Este comando de Git se utiliza para pasar los cambios desde su copia de trabajo local al repositorio, creando una nueva revisión en el repositorio." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1451 @@ -1331,8 +1331,8 @@ msgstr "Conflicto" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Cuando los cambios desde el repositorio se mezclan con los cambios locales, a veces esos cambios ocurren en las mismas líneas. En este caso Subversion no puede decidir automáticamente qué versión utilizar, y se dice que el fichero está en conflicto. Tiene que editar el fichero manualmente y resolver el conflicto antes de que pueda confirmar más cambios." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Cuando los cambios desde el repositorio se mezclan con los cambios locales, a veces esos cambios ocurren en las mismas líneas. En este caso Git no puede decidir automáticamente qué versión utilizar, y se dice que el fichero está en conflicto. Tiene que editar el fichero manualmente y resolver el conflicto antes de que pueda confirmar más cambios." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1463 @@ -1341,8 +1341,8 @@ msgstr "Copiar" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "En un repositorio de Subversion puede crear una copia de un único fichero o un árbol completo. Estos se implementan como copias baratas que actúan un poco como un enlace al original en el sentido de que casi no ocupan espacio. Haciendo una copia preserva la historia del ítem en la copia, por lo que puede rastrear los cambios que se hicieron antes de que ocurriera la copia." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "En un repositorio de Git puede crear una copia de un único fichero o un árbol completo. Estos se implementan como copias baratas que actúan un poco como un enlace al original en el sentido de que casi no ocupan espacio. Haciendo una copia preserva la historia del ítem en la copia, por lo que puede rastrear los cambios que se hicieron antes de que ocurriera la copia." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1475 @@ -1381,8 +1381,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Un sistema de ficheros propietario de Subversion que se utiliza como soporte de los repositorios. Se puede utilizar en unidades compartidas de red. Se utiliza por defecto para los repositorios creados a partir de la versión 1.2." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Un sistema de ficheros propietario de Git que se utiliza como soporte de los repositorios. Se puede utilizar en unidades compartidas de red. Se utiliza por defecto para los repositorios creados a partir de la versión 1.2." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1515 @@ -1411,8 +1411,8 @@ msgstr "Importar" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Comando de Subversion para importar una jerarquía de carpetas completa en el repositorio en una única revisión." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Comando de Git para importar una jerarquía de carpetas completa en el repositorio en una única revisión." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1540 @@ -1466,8 +1466,8 @@ msgstr "Parche" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Si una copia de trabajo tiene cambios únicamente en ficheros de texto, es posible utilizar el comando Diff de Subversion para generar un único fichero con el resúmen de esos cambios en el formato de Diff unificado. Un fichero de este tipo a menudo se denomina Parche, y puede ser enviado por email a otro (o a una lista de correo) y apllicado en otra copia de trabajo. Alguien sin acceso de confirmación puede hacer cambios y enviar un fichero de parche para que lo aplique un confirmador autorizado. O si no está seguro de un cambio, puede enviar el parche a otros para que lo revisen." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Si una copia de trabajo tiene cambios únicamente en ficheros de texto, es posible utilizar el comando Diff de Git para generar un único fichero con el resúmen de esos cambios en el formato de Diff unificado. Un fichero de este tipo a menudo se denomina Parche, y puede ser enviado por email a otro (o a una lista de correo) y apllicado en otra copia de trabajo. Alguien sin acceso de confirmación puede hacer cambios y enviar un fichero de parche para que lo aplique un confirmador autorizado. O si no está seguro de un cambio, puede enviar el parche a otros para que lo revisen." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1599 @@ -1476,8 +1476,8 @@ msgstr "Propiedad" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Además de versionar sus directorios y ficheros, Subversion le permite añadir metainformación versionada - llamadas propiedades para cada uno de sus directorios y ficheros versionados. Cada propiedad tiene un nombre y un valor, como un entrada del registro. Subversion tiene algunas propiedades especiales que utiliza internamente, como svn:eol-style. TortoiseGit también tiene algunas, como tsvn:logminsize. Puede añadir sus propias propiedades con cualquier nombre y valor que quiera." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Además de versionar sus directorios y ficheros, Git le permite añadir metainformación versionada - llamadas propiedades para cada uno de sus directorios y ficheros versionados. Cada propiedad tiene un nombre y un valor, como un entrada del registro. Git tiene algunas propiedades especiales que utiliza internamente, como svn:eol-style. TortoiseGit también tiene algunas, como tsvn:logminsize. Puede añadir sus propias propiedades con cualquier nombre y valor que quiera." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1614 @@ -1521,8 +1521,8 @@ msgstr "Revertir" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1665 @@ -1556,13 +1556,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Una abreviatura muy usada para Subversion." +msgid "A frequently-used abbreviation for Git." +msgstr "Una abreviatura muy usada para Git." #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "El nombre del protocolo personalizado de Subversion que utiliza el servidor de repositorios svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "El nombre del protocolo personalizado de Git que utiliza el servidor de repositorios svnserve." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1707 @@ -1581,8 +1581,8 @@ msgstr "Actualizar" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Este comando de Subversion incorpora los últimos cambios del repositorio a su copia de trabajo, fusionando cualquier cambio hecho por otros con los cambios locales en la copia de trabajo." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Este comando de Git incorpora los últimos cambios del repositorio a su copia de trabajo, fusionando cualquier cambio hecho por otros con los cambios locales en la copia de trabajo." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1731 diff --git a/doc/po/TortoiseMerge_fi.po b/doc/po/TortoiseMerge_fi.po index a5b0162..e77da25 100644 --- a/doc/po/TortoiseMerge_fi.po +++ b/doc/po/TortoiseMerge_fi.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2008-10-24 23:17 +0000\n" "PO-Revision-Date: 2009-02-03 21:30+0200\n" "Last-Translator: Kari Granö \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -213,8 +213,8 @@ msgstr "Kun työskentelet tekstitiedostojen kanssa (esim. lähdekooditiedostot, #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "Jos työskentelet versionhallintajärjestelmän (esimerkiksi Subversion) kanssa, törmäät joskus ristiriitoihin päivittäessäsi työkopiotasi. Näin tapahtuu, kun joku toinen muuttaa samoja osia kuin siitä tiedostosta, jota parhaillaan työstät. Tällaisessa tilanteessa syntyneet ristiriidat pitää ratkoa käsin, ja silloin TortoiseMerge voi auttaa." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "Jos työskentelet versionhallintajärjestelmän (esimerkiksi Git) kanssa, törmäät joskus ristiriitoihin päivittäessäsi työkopiotasi. Näin tapahtuu, kun joku toinen muuttaa samoja osia kuin siitä tiedostosta, jota parhaillaan työstät. Tällaisessa tilanteessa syntyneet ristiriidat pitää ratkoa käsin, ja silloin TortoiseMerge voi auttaa." #. (para) #: ../source/TortoiseMerge_en.xml:206 @@ -235,8 +235,8 @@ msgstr "Ristiriita voi myös syntyä, kun koetat käyttää vanhentunutta paikka #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "TortoiseMergen ansiosta tämä ei kuitenkaan ole enää tarpeen - ainakin jos työskentelet Subversionin kaltaisen versionhallintajärjestelmän kanssa. TortoiseMerge jäsentää paikkatiedoston sille versiolle, jolle paikkatiedosto luotiin, ja koettaa automaattisesti noutaa tämän version arkistostasi. Sitten se käyttää paikkatiedoston ja antaa sinun ja muiden katselmoida muutoksesi ko. tiedostoon. Lopuksi voit päättää, mitkä muutokset haluat pitää." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "TortoiseMergen ansiosta tämä ei kuitenkaan ole enää tarpeen - ainakin jos työskentelet Gitin kaltaisen versionhallintajärjestelmän kanssa. TortoiseMerge jäsentää paikkatiedoston sille versiolle, jolle paikkatiedosto luotiin, ja koettaa automaattisesti noutaa tämän version arkistostasi. Sitten se käyttää paikkatiedoston ja antaa sinun ja muiden katselmoida muutoksesi ko. tiedostoon. Lopuksi voit päättää, mitkä muutokset haluat pitää." #. (title) #: ../source/TortoiseMerge_en.xml:235 @@ -260,8 +260,8 @@ msgstr "Vietimme runsaasti aikaa etsien internetistä graafisella käyttöliitty #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "Koska TortoiseGit käyttää Subversion-kirjastoa, johon sisältyy näppärä vertailumekanismi, oli luontevaa valita se GNU diff -kirjaston sijaan." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "Koska TortoiseGit käyttää Git-kirjastoa, johon sisältyy näppärä vertailumekanismi, oli luontevaa valita se GNU diff -kirjaston sijaan." #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -275,8 +275,8 @@ msgstr "Kahden tiedoston välisten erojen tutkiminen ja muutosten yhdistäminen #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." -msgstr "Päivityksestä johtuvien, paikallisten ja Subversion-arkistossa olevien muutosten välillä olevien ristiriitojen selvittäminen." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." +msgstr "Päivityksestä johtuvien, paikallisten ja Git-arkistossa olevien muutosten välillä olevien ristiriitojen selvittäminen." #. (para) #: ../source/TortoiseMerge_en.xml:294 @@ -349,8 +349,8 @@ msgstr "Paikkatiedoston käyttäminen" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." -msgstr "Paikkatiedosto on Subversionin unified diff -muodossa oleva tiedosto, joka sisältää tarvittavat tiedot muutosten soveltamiseksi joukolle tiedostoja. Paikka voi olla toisen kehittäjän lähettämä, ja sen avulla voit nähdä hänen tekemänsä muutokset ja mahdollisesti toimittaa ne arkistoon. Paikka voi myös olla TortoiseGit-ohjelman toimesta tuotettu vertailtaessa kahta kansiota. Tämä tapahtuu, kun vertaat arkiston versiota työkopiosi kansioon, kahta arkiston versiota, tai kahta erilaista arkiston polkua." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgstr "Paikkatiedosto on Gitin unified diff -muodossa oleva tiedosto, joka sisältää tarvittavat tiedot muutosten soveltamiseksi joukolle tiedostoja. Paikka voi olla toisen kehittäjän lähettämä, ja sen avulla voit nähdä hänen tekemänsä muutokset ja mahdollisesti toimittaa ne arkistoon. Paikka voi myös olla TortoiseGit-ohjelman toimesta tuotettu vertailtaessa kahta kansiota. Tämä tapahtuu, kun vertaat arkiston versiota työkopiosi kansioon, kahta arkiston versiota, tai kahta erilaista arkiston polkua." #. (para) #: ../source/TortoiseMerge_en.xml:380 @@ -451,8 +451,8 @@ msgstr "Luettuaan paikkatiedoston TortoiseMerge avaa pienen ikkunan, jossa on lu #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "Tilanteen voi kuitenkin vielä pelastaa. Jos käytät Subversion-ohjelmaa, voit palauttaa tiedostosta vanhemman version ja ratkaista ristiriidan. Itse asiassa TortoiseMerge yrittää automaattisesti hakea tiedoston vanhemman version ja näyttää sitten erot tiedostojen Kanta (tiedoston vanhempi versio), Minun (tiedoston työkopio) ja Heidän (tiedoston vanhempi versio, jossa paikka on jo otettu käyttöön). Voit sitten ratkoa mahdolliset ristiriidat käsin." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "Tilanteen voi kuitenkin vielä pelastaa. Jos käytät Git-ohjelmaa, voit palauttaa tiedostosta vanhemman version ja ratkaista ristiriidan. Itse asiassa TortoiseMerge yrittää automaattisesti hakea tiedoston vanhemman version ja näyttää sitten erot tiedostojen Kanta (tiedoston vanhempi versio), Minun (tiedoston työkopio) ja Heidän (tiedoston vanhempi versio, jossa paikka on jo otettu käyttöön). Voit sitten ratkoa mahdolliset ristiriidat käsin." #. (para) #: ../source/TortoiseMerge_en.xml:504 @@ -651,8 +651,8 @@ msgstr "Kolmen paneelin näkymässä (jota joskus kutsutaan yhdistämi #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." -msgstr "Joskus Subversion merkitsee tiedoston ristiriitaiseksi, mutta katsoessasi sitä TortoiseMergellä ristiriitoja ei löydy. Tämä saattaa johtua valitsemastasi tyhjämerkkien käsittelytavasta. Jos päätät ohittaa rivinlopputyyli- tai tyhjämerkkien muutokset, tällaiset rivit merkitään Ohitettu ristiriita-kuvakkeella. Ratkaistaksesi ristiriidan sinun on silti valittava, mitä versiota haluat käyttää." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgstr "Joskus Git merkitsee tiedoston ristiriitaiseksi, mutta katsoessasi sitä TortoiseMergellä ristiriitoja ei löydy. Tämä saattaa johtua valitsemastasi tyhjämerkkien käsittelytavasta. Jos päätät ohittaa rivinlopputyyli- tai tyhjämerkkien muutokset, tällaiset rivit merkitään Ohitettu ristiriita-kuvakkeella. Ratkaistaksesi ristiriidan sinun on silti valittava, mitä versiota haluat käyttää." #. (para) #: ../source/TortoiseMerge_en.xml:804 @@ -701,8 +701,8 @@ msgstr "Jos haluat käyttää paikkatiedoston, sinun pitää antaa sekä itse pa #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" -msgstr "Nykyisin tuetaan vain unified diff -muodossa olevia paikkatiedoja. Lisäksi nämä tiedostot tulee luoda Subversion-työkopiosta. Muita tiedostomuotoja (esim. CVS-paikkatiedostot) ei tueta!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" +msgstr "Nykyisin tuetaan vain unified diff -muodossa olevia paikkatiedoja. Lisäksi nämä tiedostot tulee luoda Git-työkopiosta. Muita tiedostomuotoja (esim. CVS-paikkatiedostot) ei tueta!" #. (title) #: ../source/TortoiseMerge_en.xml:884 @@ -746,8 +746,8 @@ msgstr "Valinta Väritä rivin sisäiset muutokset käyttä #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "Valinta Vertaa tyhjämerkkejä näyttää kaikki muutokset sisennyksessä ja rivin sisäisissä tyhjämerkeissä lisättyinä/poistettuina riveinä (samaan tapaan kuin Subversion käsittelee tällaisia muutoksia)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "Valinta Vertaa tyhjämerkkejä näyttää kaikki muutokset sisennyksessä ja rivin sisäisissä tyhjämerkeissä lisättyinä/poistettuina riveinä (samaan tapaan kuin Git käsittelee tällaisia muutoksia)." #. (para) #: ../source/TortoiseMerge_en.xml:924 @@ -1253,8 +1253,8 @@ msgstr "Lisää" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Subversion-komento, jota käytetään tiedoston tai hakemiston lisäämiseen työkopioosi. Uudet alkiot lisätään versionhallintaan toimita arkistoon -komennolla." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Git-komento, jota käytetään tiedoston tai hakemiston lisäämiseen työkopioosi. Uudet alkiot lisätään versionhallintaan toimita arkistoon -komennolla." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1368 @@ -1284,7 +1284,7 @@ msgstr "BDB" #. (para) #: ../source/TortoiseMerge_en.xml:1393 msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." -msgstr "Berkeley -tietokanta. Vakaa tietokanta arkistojen toteutukseen. Ei sovellu käytettäväksi verkkojakojen (file://) kanssa. Oletusarvoinen arkiston toteutustapa ennen Subversion-versiota 1.2." +msgstr "Berkeley -tietokanta. Vakaa tietokanta arkistojen toteutukseen. Ei sovellu käytettäväksi verkkojakojen (file://) kanssa. Oletusarvoinen arkiston toteutustapa ennen Git-versiota 1.2." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1400 @@ -1293,8 +1293,8 @@ msgstr "Haara" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Versionhallintajärjestelmissä usein käytetty termi, joka kuvaa, mitä tapahtuu, kun kehitystyö haarautuu kahteen erilliseen polkuun. Pääkehityshaara joudutaan haaroittamaan esimerkiksi silloin, kun tarvitaan uusi ominaisuus, jota voidaan kehittää ajan kanssa tekemättä päähaarasta epävakaata. Toinen vaihtoehto on tehdä päähaarasta julkaisua varten haara, johon tehdään vain virhekorjauksia, ja samaan aikaan uusia toimintoja kehitetään epävakaaseen päähaaraan. Subversion toteuttaa haarat halpoina kopioina." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Versionhallintajärjestelmissä usein käytetty termi, joka kuvaa, mitä tapahtuu, kun kehitystyö haarautuu kahteen erilliseen polkuun. Pääkehityshaara joudutaan haaroittamaan esimerkiksi silloin, kun tarvitaan uusi ominaisuus, jota voidaan kehittää ajan kanssa tekemättä päähaarasta epävakaata. Toinen vaihtoehto on tehdä päähaarasta julkaisua varten haara, johon tehdään vain virhekorjauksia, ja samaan aikaan uusia toimintoja kehitetään epävakaaseen päähaaraan. Git toteuttaa haarat halpoina kopioina." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 @@ -1303,8 +1303,8 @@ msgstr "Hae työkopio" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Subversion-komento, joka luo paikallisen työkopion tyhjään hakemistoon noutamalla versioituja tiedostoja arkistosta." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Git-komento, joka luo paikallisen työkopion tyhjään hakemistoon noutamalla versioituja tiedostoja arkistosta." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1424 @@ -1313,8 +1313,8 @@ msgstr "Siivous" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Lainaus Subversion-kirjasta: Siivoaa työkopion rekursiivisesti poistamalla lukot ja kesken jääneet operaatiot. Jos törmäät joskus työkopio lukittu -virheeseen, suorita tämä komento poistaaksesi vanhentuneet lukot ja tehdäksesi työkopiosta jälleen käyttökelpoisen. Huomaa, että tässä lukko viittaa paikallisen tiedostojärjestelmän lukitukseen, ei arkistolukitukseen." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Lainaus Git-kirjasta: Siivoaa työkopion rekursiivisesti poistamalla lukot ja kesken jääneet operaatiot. Jos törmäät joskus työkopio lukittu -virheeseen, suorita tämä komento poistaaksesi vanhentuneet lukot ja tehdäksesi työkopiosta jälleen käyttökelpoisen. Huomaa, että tässä lukko viittaa paikallisen tiedostojärjestelmän lukitukseen, ei arkistolukitukseen." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1441 @@ -1323,8 +1323,8 @@ msgstr "Toimita arkistoon" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Tämä Subversion-komento siirtää muutokset paikallisesta työkopiostasi takaisin arkistoon luoden samalla uuden arkistoversion." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Tämä Git-komento siirtää muutokset paikallisesta työkopiostasi takaisin arkistoon luoden samalla uuden arkistoversion." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1451 @@ -1333,8 +1333,8 @@ msgstr "Ristiriita" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Kun arkiston muutokset yhdistetään paikallisten muutosten kanssa, ne osuvat joskus samoille riveille. Tällöin Subversion ei voi automaattisesti päättää, mitä versiota käyttää ja tiedoston sanotaan olevan ristiriitainen. Sinun pitää muokata tiedostoa käsin ratkaistaksesi ristiriidat ennen kuin voit toimittaa muutokset arkistoon." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Kun arkiston muutokset yhdistetään paikallisten muutosten kanssa, ne osuvat joskus samoille riveille. Tällöin Git ei voi automaattisesti päättää, mitä versiota käyttää ja tiedoston sanotaan olevan ristiriitainen. Sinun pitää muokata tiedostoa käsin ratkaistaksesi ristiriidat ennen kuin voit toimittaa muutokset arkistoon." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1463 @@ -1343,8 +1343,8 @@ msgstr "Kopio" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "Subversion-arkistossa voit tehdä kopion yksittäisestä tiedostosta tai kokonaisesta hakemistopuusta. Kopiot on toteutettu halpoina kopioina, jotka toimivat ikään kuin linkkeinä alkuperäiseen. Tämän ansiosta ne eivät vaadi lähes lainkaan tilaa. Kopion tekeminen säilyttää kohteen muutoshistorian, joten voit jäljittää muutoksia, jotka tapahtuivat ennen kopion tekoa." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "Git-arkistossa voit tehdä kopion yksittäisestä tiedostosta tai kokonaisesta hakemistopuusta. Kopiot on toteutettu halpoina kopioina, jotka toimivat ikään kuin linkkeinä alkuperäiseen. Tämän ansiosta ne eivät vaadi lähes lainkaan tilaa. Kopion tekeminen säilyttää kohteen muutoshistorian, joten voit jäljittää muutoksia, jotka tapahtuivat ennen kopion tekoa." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1475 @@ -1383,8 +1383,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Subversion-ohjelman tarpeisiin kehitetty tiedostojärjestelmä arkistojen toteutukseen. Voidaan käyttää verkkojakojen (file://) kanssa. Oletusarvoinen arkistojen toteutustapa Subversion-versiosta 1.2 lähtien." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Git-ohjelman tarpeisiin kehitetty tiedostojärjestelmä arkistojen toteutukseen. Voidaan käyttää verkkojakojen (file://) kanssa. Oletusarvoinen arkistojen toteutustapa Git-versiosta 1.2 lähtien." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1515 @@ -1413,8 +1413,8 @@ msgstr "Tuo" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Subversion-komento, jolla lisätään kansio (alikansioineen) arkistoon. Toimenpide synnyttää yhden uuden version." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Git-komento, jolla lisätään kansio (alikansioineen) arkistoon. Toimenpide synnyttää yhden uuden version." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1540 @@ -1468,8 +1468,8 @@ msgstr "Paikka" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Mikäli työkopiossa on vain tekstitiedostoihin tehtyjä muutoksia, on mahdollista käyttää Subversion-ohjelman Diff-komentoa muutoskoostetiedoston luomiseksi Unified Diff-muodossa. Tällaista tiedostoa kutsutaan usein paikaksi, ja se voidaan lähettää sähköpostin liitteenä jollekulle toiselle (tai postituslistalle) käytettäväksi toisessa työkopiossa. Joku, jolla ei ole oikeutta toimittaa muutoksia arkistoon suoraan, voi tehdä muutokset ja toimittaa paikkatiedoston henkilölle, jolla tällainen oikeus on. Paikkatiedostoa voi käyttää myös, kun haluat muiden katselmoivan tekemiäsi muutoksia." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Mikäli työkopiossa on vain tekstitiedostoihin tehtyjä muutoksia, on mahdollista käyttää Git-ohjelman Diff-komentoa muutoskoostetiedoston luomiseksi Unified Diff-muodossa. Tällaista tiedostoa kutsutaan usein paikaksi, ja se voidaan lähettää sähköpostin liitteenä jollekulle toiselle (tai postituslistalle) käytettäväksi toisessa työkopiossa. Joku, jolla ei ole oikeutta toimittaa muutoksia arkistoon suoraan, voi tehdä muutokset ja toimittaa paikkatiedoston henkilölle, jolla tällainen oikeus on. Paikkatiedostoa voi käyttää myös, kun haluat muiden katselmoivan tekemiäsi muutoksia." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1599 @@ -1478,8 +1478,8 @@ msgstr "Ominaisuus" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Kansioiden ja tiedostojen versioinnin lisäksi Subversion sallii versioidun metatiedon (ominaisuuksien) lisäämisen kuhunkin versioituun kansioon ja tiedostoon. Kullakin ominaisuudella on nimi ja arvo (vrt. rekisteriavain). Subversion-ohjelmalla on muutamia erikoisominaisuuksia, joita se käyttää sisäisesti (esim. svn:eol-style. TortoiseGit-ohjelmalla on myös muutamia, kuten esimerkiksi svn:logminsize. Voit myös lisätä omia ominaisuuksiasi haluamasi nimellä ja arvolla." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Kansioiden ja tiedostojen versioinnin lisäksi Git sallii versioidun metatiedon (ominaisuuksien) lisäämisen kuhunkin versioituun kansioon ja tiedostoon. Kullakin ominaisuudella on nimi ja arvo (vrt. rekisteriavain). Git-ohjelmalla on muutamia erikoisominaisuuksia, joita se käyttää sisäisesti (esim. svn:eol-style. TortoiseGit-ohjelmalla on myös muutamia, kuten esimerkiksi svn:logminsize. Voit myös lisätä omia ominaisuuksiasi haluamasi nimellä ja arvolla." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1614 @@ -1523,8 +1523,8 @@ msgstr "Palauta" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion säilyttää paikallisesti muuttumatonta kopiota jokaisesta tiedostosta sellaisena kuin se oli silloin, kun viimeksi päivitit työkopiosi. Jos olet tehnyt muutoksia ja päätät perua ne, voit käyttää palauta-komentoa siirtyäksesi takaisin muuttumattomaan kopioon." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git säilyttää paikallisesti muuttumatonta kopiota jokaisesta tiedostosta sellaisena kuin se oli silloin, kun viimeksi päivitit työkopiosi. Jos olet tehnyt muutoksia ja päätät perua ne, voit käyttää palauta-komentoa siirtyäksesi takaisin muuttumattomaan kopioon." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1665 @@ -1558,13 +1558,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Subversion-ohjelmasta usein käytetty lyhenne." +msgid "A frequently-used abbreviation for Git." +msgstr "Git-ohjelmasta usein käytetty lyhenne." #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Subversionin käyttämän erikoisprotokollan nimi, jota käyttää mm. svnserve versionhallintapalvelin." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Gitin käyttämän erikoisprotokollan nimi, jota käyttää mm. svnserve versionhallintapalvelin." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1707 @@ -1583,8 +1583,8 @@ msgstr "Päivitä" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Tämä Subversion-komento noutaa viimeisimmät muutokset arkistosta työkopioosi, yhdistäen muitten tekemät muutokset paikallisten muutosten kanssa" +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Tämä Git-komento noutaa viimeisimmät muutokset arkistosta työkopioosi, yhdistäen muitten tekemät muutokset paikallisten muutosten kanssa" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1731 diff --git a/doc/po/TortoiseMerge_fr.po b/doc/po/TortoiseMerge_fr.po index e9dc044..26e8118 100644 --- a/doc/po/TortoiseMerge_fr.po +++ b/doc/po/TortoiseMerge_fr.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2008-11-28 13:12+0100\n" "Last-Translator: Grokwik \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -211,8 +211,8 @@ msgstr "Quand vous travaillez sur des fichiers textes, les fichiers source de vo #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "Si vous travaillez avec un système de contôle de version (i.e. Subversion) alors vous obtenez parfois un conflit lors de la mise à jour de votre copie de travail. Cela se produit si quelqu'un d'autre a modifié les même parties du fichier sur lequel vous travaillez. Alors, vous devez résoudre ces conflits manuellement. C'est là que TortoiseMerge peut vous aider." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "Si vous travaillez avec un système de contôle de version (i.e. Git) alors vous obtenez parfois un conflit lors de la mise à jour de votre copie de travail. Cela se produit si quelqu'un d'autre a modifié les même parties du fichier sur lequel vous travaillez. Alors, vous devez résoudre ces conflits manuellement. C'est là que TortoiseMerge peut vous aider." #. (para) #: ../source/TortoiseMerge_en.xml:206 @@ -233,8 +233,8 @@ msgstr "Un conflit peut aussi se produire si vous essayez d'appliquer un patch p #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "Mais maintenant avec TortoiseMerge, ce n'est plus nécessaire - du moins si vous travaillez avec un système de contrôle de version comme Subversion. TortoiseMerge analyse le patch pour la révision/version pour laquelle le patch a été créé et essaye automatiquement de trouver cette révision particulière depuis votre système de contrôle de version. Puis, il applique le patch et vous laisse examiner vos changements et les leur. Vous pouvez ensuite décider quels changements vous souhaitez conserver." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "Mais maintenant avec TortoiseMerge, ce n'est plus nécessaire - du moins si vous travaillez avec un système de contrôle de version comme Git. TortoiseMerge analyse le patch pour la révision/version pour laquelle le patch a été créé et essaye automatiquement de trouver cette révision particulière depuis votre système de contrôle de version. Puis, il applique le patch et vous laisse examiner vos changements et les leur. Vous pouvez ensuite décider quels changements vous souhaitez conserver." #. (title) #: ../source/TortoiseMerge_en.xml:235 @@ -258,8 +258,8 @@ msgstr "Nous avons donc passé beaucoup de temps à chercher sur internet un out #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "TortoiseGit utilise la librairie Subversion, qui intègre un bon moteur de différenciation, il est donc naturel d'utiliser cette librairie au lieu du diff GNU. " +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "TortoiseGit utilise la librairie Git, qui intègre un bon moteur de différenciation, il est donc naturel d'utiliser cette librairie au lieu du diff GNU. " #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -273,8 +273,8 @@ msgstr "Voir les différences entre deux fichiers et fusionner les changements d #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." -msgstr "Éditer les conflits entre les changements locaux et les changements du référentiel Subversion après une mise à jour." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." +msgstr "Éditer les conflits entre les changements locaux et les changements du référentiel Git après une mise à jour." #. (para) #: ../source/TortoiseMerge_en.xml:294 @@ -347,8 +347,8 @@ msgstr "Appliquer des patches" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." -msgstr "Un fichier patch est un fichier de différences unifiées Subversion, qui contient les informations nécessaires à l'application d'un jeu de modifications. Le patch peut avoir été fourni par un autre développeur pour que vous puissiez voir les changements qu'il a fait et éventuellement les livrer au référentiel. Ou, il peut avoir été généré en interne par TortoiseGit lors de la comparaison de deux répertoires. Cela arrive parfois lorsque vous comparez une révision du référentiel avec votre copie de travail, si vous comparez deux révisions différentes du référentiel ou si vous comparez deux référéntiels différents." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgstr "Un fichier patch est un fichier de différences unifiées Git, qui contient les informations nécessaires à l'application d'un jeu de modifications. Le patch peut avoir été fourni par un autre développeur pour que vous puissiez voir les changements qu'il a fait et éventuellement les livrer au référentiel. Ou, il peut avoir été généré en interne par TortoiseGit lors de la comparaison de deux répertoires. Cela arrive parfois lorsque vous comparez une révision du référentiel avec votre copie de travail, si vous comparez deux révisions différentes du référentiel ou si vous comparez deux référéntiels différents." #. (para) #: ../source/TortoiseMerge_en.xml:380 @@ -449,8 +449,8 @@ msgstr "Après qu TortoiseMerge ait analysé le patch, il affichera une petite f #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "Mais ne vous inquiétez pas. Si vous travaillez avec Subversion vous pouvez retrouver une version plus ancienne du fichier et résoudre le conflit. En fait, TortoiseMerge essaye automatiquement de récupérer cette version plus ancienne du fichier et vous montre les différences entre le fichier de base (la version plus ancienne du fichier), le mien (le fichier tel qu'il se trouve actuellement dans votre copie de travail) et le leur (la version plus ancienne du fichier avec le patch déjà appliqué). Ensuite vous pouvez résoudre les conflits éventuels à la main." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "Mais ne vous inquiétez pas. Si vous travaillez avec Git vous pouvez retrouver une version plus ancienne du fichier et résoudre le conflit. En fait, TortoiseMerge essaye automatiquement de récupérer cette version plus ancienne du fichier et vous montre les différences entre le fichier de base (la version plus ancienne du fichier), le mien (le fichier tel qu'il se trouve actuellement dans votre copie de travail) et le leur (la version plus ancienne du fichier avec le patch déjà appliqué). Ensuite vous pouvez résoudre les conflits éventuels à la main." #. (para) #: ../source/TortoiseMerge_en.xml:504 @@ -649,8 +649,8 @@ msgstr "Si vous êtes en vue panneau triple (parfois appelée vue de #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." -msgstr "Parfois une fichier sera marqué comme étant en conflit dans Subversion, et ce conflit ne sera pas indiqué dans TortoiseMerge. Ce peut être dû à la politique de gestion des caractères d'espacement que vous avez choisie. Si vous avez choisi d'ignorer les modifications de caractères d'espacement ou de fin de ligne, de telles lignes seront marquées par l'icone Conflit-Ignoré. Pour résoudre ce conflit, vous devez sélectionner la version que vous souhaitez utiliser." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgstr "Parfois une fichier sera marqué comme étant en conflit dans Git, et ce conflit ne sera pas indiqué dans TortoiseMerge. Ce peut être dû à la politique de gestion des caractères d'espacement que vous avez choisie. Si vous avez choisi d'ignorer les modifications de caractères d'espacement ou de fin de ligne, de telles lignes seront marquées par l'icone Conflit-Ignoré. Pour résoudre ce conflit, vous devez sélectionner la version que vous souhaitez utiliser." #. (para) #: ../source/TortoiseMerge_en.xml:804 @@ -699,8 +699,8 @@ msgstr "Si vous voulez appliquer un patch, vous devez indiquer à la fois le che #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" -msgstr "Actuellement, seuls les patches au format de différences unifiées sont supportés. Et seuls ceux générés à partir d'une copie de travail de Subversion. Les autres formats comme les patches générés par CVS ne sont pas supportés pour l'instant !" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" +msgstr "Actuellement, seuls les patches au format de différences unifiées sont supportés. Et seuls ceux générés à partir d'une copie de travail de Git. Les autres formats comme les patches générés par CVS ne sont pas supportés pour l'instant !" #. (title) #: ../source/TortoiseMerge_en.xml:884 @@ -744,8 +744,8 @@ msgstr "Coloriser les changements de code en ligne utilise #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "Comparer les espacements affiche tous les changements d'indentation et d'espacements en ligne en tant que lignes ajoutées/supprimées (c'est de cette façon que Subversion considère de tels changements)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "Comparer les espacements affiche tous les changements d'indentation et d'espacements en ligne en tant que lignes ajoutées/supprimées (c'est de cette façon que Git considère de tels changements)." #. (para) #: ../source/TortoiseMerge_en.xml:924 @@ -1251,8 +1251,8 @@ msgstr "Ajouter" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Une commande Subversion utilisée pour ajouter un fichier ou un répertoire à votre copie de travail. Les nouveaux éléments sont ajoutés au référentiel à la livraison." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Une commande Git utilisée pour ajouter un fichier ou un répertoire à votre copie de travail. Les nouveaux éléments sont ajoutés au référentiel à la livraison." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1368 @@ -1291,8 +1291,8 @@ msgstr "Branche" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Un terme fréquemment utilisé dans les système de contrôle de révisions pour décrire ce qu'il se passe quand le développement se scinde à un point particulier et suit 2 chemins séparés. Vous pouvez créer une branche en dehors de la ligne de développement principale pour développer une nouvelle fonctionnalité sans rendre la ligne principale instable. Ou vous pouvez créer une branche avec la version stable sur laquelle vous ne ferez que des corrections de bugs, pendant que les nouveaux développements sont faits sur la branche instable. Dans Subversion, une branche est considérée comme étant une copie bon marché." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Un terme fréquemment utilisé dans les système de contrôle de révisions pour décrire ce qu'il se passe quand le développement se scinde à un point particulier et suit 2 chemins séparés. Vous pouvez créer une branche en dehors de la ligne de développement principale pour développer une nouvelle fonctionnalité sans rendre la ligne principale instable. Ou vous pouvez créer une branche avec la version stable sur laquelle vous ne ferez que des corrections de bugs, pendant que les nouveaux développements sont faits sur la branche instable. Dans Git, une branche est considérée comme étant une copie bon marché." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 @@ -1301,8 +1301,8 @@ msgstr "Extraire" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Une commande Subversion qui crée une copie de travail locale dans un répertoire vide en téléchargeant les fichiers versionnés depuis le référentiel." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Une commande Git qui crée une copie de travail locale dans un répertoire vide en téléchargeant les fichiers versionnés depuis le référentiel." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1424 @@ -1311,8 +1311,8 @@ msgstr "Nettoyer" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Pour citer le manuel Subversion : Nettoie récursivement la copie de travail, en supprimant les verrous et en reprenant les opérations non terminées. Si vous obtenez une erreur copie de travail verrouillée, exécutez cette commande pour supprimer les vieux verrous et rendre votre copie de travail utilisable à nouveau. Notez que dans ce contexte, le verrou fait référence au verrouillage du système de fichiers local et non au verrouillage du référentiel." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Pour citer le manuel Git : Nettoie récursivement la copie de travail, en supprimant les verrous et en reprenant les opérations non terminées. Si vous obtenez une erreur copie de travail verrouillée, exécutez cette commande pour supprimer les vieux verrous et rendre votre copie de travail utilisable à nouveau. Notez que dans ce contexte, le verrou fait référence au verrouillage du système de fichiers local et non au verrouillage du référentiel." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1441 @@ -1321,8 +1321,8 @@ msgstr "Livrer" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Cette commande Subversion est utilisée pour renvoyer les changements de votre copie de travail locale au référentiel, en créant une nouvelle révision du référentiel." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Cette commande Git est utilisée pour renvoyer les changements de votre copie de travail locale au référentiel, en créant une nouvelle révision du référentiel." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1451 @@ -1331,8 +1331,8 @@ msgstr "Conf" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Quand les changements du référentiel sont fusionnés avec les changements locaux, ces changements se produisent parfois sur les mêmes lignes. Dans ce cas, Subversion ne peut pas décider automatiquement quelle version utilisée et le fichier est dit en conflit. Vous devez éditer le fichier manuellement et résoudre le conflit avant de pouvoir livrer d'autres modifications." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Quand les changements du référentiel sont fusionnés avec les changements locaux, ces changements se produisent parfois sur les mêmes lignes. Dans ce cas, Git ne peut pas décider automatiquement quelle version utilisée et le fichier est dit en conflit. Vous devez éditer le fichier manuellement et résoudre le conflit avant de pouvoir livrer d'autres modifications." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1463 @@ -1341,8 +1341,8 @@ msgstr "Copier" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "Dans un référentiel Subversion, vous pouvez créer une copie d'un unique fichier ou de toute une arborescence. Celles-ci sont implémentées comme des copies bon marché qui fonctionnent comme des liens vers l'original dans le sens où elles ne prennent quasiment pas de place. Faire une copie préserve l'historique de l'élément dans la copie, donc vous pouvez suivre les changements effectués avant que la copie n'ait été faite. " +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "Dans un référentiel Git, vous pouvez créer une copie d'un unique fichier ou de toute une arborescence. Celles-ci sont implémentées comme des copies bon marché qui fonctionnent comme des liens vers l'original dans le sens où elles ne prennent quasiment pas de place. Faire une copie préserve l'historique de l'élément dans la copie, donc vous pouvez suivre les changements effectués avant que la copie n'ait été faite. " #. (glossterm) #: ../source/TortoiseMerge_en.xml:1475 @@ -1381,8 +1381,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Un système de gestion de fichiers propriétaire de Subversion pour les référentiels. Peut être utilisé pour les partages réseaux. Par défaut pour les référentiels 1.2 et plus récents." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Un système de gestion de fichiers propriétaire de Git pour les référentiels. Peut être utilisé pour les partages réseaux. Par défaut pour les référentiels 1.2 et plus récents." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1515 @@ -1411,8 +1411,8 @@ msgstr "Importer" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "La commande Subversion pour importer une hiérarchie de dossiers complète dans le référentiel en une seule révision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "La commande Git pour importer une hiérarchie de dossiers complète dans le référentiel en une seule révision." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1540 @@ -1466,8 +1466,8 @@ msgstr "Patch" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Si la copie de travail n'a que des modifications sur des fichiers texte, il est possible d'utiliser la commande Subversion Voir les différences pour générer un unique fichier résumant ces changements dans le format de différences unifiées. Un fichier de ce type est souvent connu comme un Patch et il peut envoyé par email à quelqu'un d'autre (ou à une mailing list) et appliqué à une autre copie de travail. Une personne sans un accès pour livrer peut effectuer ces changements et soumettre un fichier patch à une personne autorisée à livrer pour qu'elle l'applique. Ou si vous n'êtes pas sûr d'un changement, vous pouvez soumettre un patch aux autres pour qu'ils l'examinent." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Si la copie de travail n'a que des modifications sur des fichiers texte, il est possible d'utiliser la commande Git Voir les différences pour générer un unique fichier résumant ces changements dans le format de différences unifiées. Un fichier de ce type est souvent connu comme un Patch et il peut envoyé par email à quelqu'un d'autre (ou à une mailing list) et appliqué à une autre copie de travail. Une personne sans un accès pour livrer peut effectuer ces changements et soumettre un fichier patch à une personne autorisée à livrer pour qu'elle l'applique. Ou si vous n'êtes pas sûr d'un changement, vous pouvez soumettre un patch aux autres pour qu'ils l'examinent." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1599 @@ -1476,8 +1476,8 @@ msgstr "Propriété" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "En plus de versionner vos répertoires et vos fichiers, Subversion vous permet d'ajouter des métadonnées versionnées - connues comme des propriétés - à chacun de vos fichiers et répertoires versionnés. Chaque propriété possède un nom et une valeur, plutôt qu'une clé de régistre. Subversion dispose de quelques propriétés spéciales qu'il utilise en interne, comme svn:eol-style. TortoiseGit en a aussi, tel que tsvn:logminsize. Vous pouvez ajouter vos propres propriétés avec des noms et des valeurs de votre choix." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "En plus de versionner vos répertoires et vos fichiers, Git vous permet d'ajouter des métadonnées versionnées - connues comme des propriétés - à chacun de vos fichiers et répertoires versionnés. Chaque propriété possède un nom et une valeur, plutôt qu'une clé de régistre. Git dispose de quelques propriétés spéciales qu'il utilise en interne, comme svn:eol-style. TortoiseGit en a aussi, tel que tsvn:logminsize. Vous pouvez ajouter vos propres propriétés avec des noms et des valeurs de votre choix." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1614 @@ -1521,8 +1521,8 @@ msgstr "Revenire en arrière" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion conserve une copie primitive locale de chaque fichier tel qu'il était lors de la dernière mise à jour de votre copie de travail. Si vous avez des changements et que vous décidez de les annuler, vous pouvez utiliser la commande Revenir en arrière pour revenir à la copie primitive." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git conserve une copie primitive locale de chaque fichier tel qu'il était lors de la dernière mise à jour de votre copie de travail. Si vous avez des changements et que vous décidez de les annuler, vous pouvez utiliser la commande Revenir en arrière pour revenir à la copie primitive." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1665 @@ -1556,13 +1556,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Une abbréviation courante pour Subversion." +msgid "A frequently-used abbreviation for Git." +msgstr "Une abbréviation courante pour Git." #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Le nom du protocole personnalisé de Subversion utilisé par le serveur de référentiel svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Le nom du protocole personnalisé de Git utilisé par le serveur de référentiel svnserve." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1707 @@ -1581,8 +1581,8 @@ msgstr "Mettre à jour" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Cette commande Subversion récupère les derniers changements depuis le référentiel vers votre copie de travail, en fusionnant les modifications faites par d'autres avec les modifications locales dans la copie de travail." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Cette commande Git récupère les derniers changements depuis le référentiel vers votre copie de travail, en fusionnant les modifications faites par d'autres avec les modifications locales dans la copie de travail." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1731 diff --git a/doc/po/TortoiseMerge_hr.po b/doc/po/TortoiseMerge_hr.po index 08f6c62..875a937 100644 --- a/doc/po/TortoiseMerge_hr.po +++ b/doc/po/TortoiseMerge_hr.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2006-06-30 00:11GMT Daylight Time\n" "PO-Revision-Date: 2006-07-26 14:58+0100\n" "Last-Translator: Lübbe Onken \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -199,8 +199,8 @@ msgstr "Dok radite na tekst datotekama, napr. programirate u vašem omiljenom pr #: source/TortoiseMerge_en.xml:194 #: (para) -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "Ako koristite sustav za upravljanje verzijama (napr. Subversion) tada ćete ponekad imati sporne dijelove kada obnavljate vašu radnu kopiju. To se događa ako netko drugi promjeni iste dijelove datoteke koju ste i vi promijenili. Tada treba ručno riješiti ove sporove. U tome će vam pomoći TortoiseMerge." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "Ako koristite sustav za upravljanje verzijama (napr. Git) tada ćete ponekad imati sporne dijelove kada obnavljate vašu radnu kopiju. To se događa ako netko drugi promjeni iste dijelove datoteke koju ste i vi promijenili. Tada treba ručno riješiti ove sporove. U tome će vam pomoći TortoiseMerge." #: source/TortoiseMerge_en.xml:202 #: (para) @@ -219,8 +219,8 @@ msgstr "Sukob se može dogoditi ako pokušate primjeniti zastarjele zakrpe. U ti #: source/TortoiseMerge_en.xml:216 #: (para) -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patchfile for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "No ako koristite Subversion ili TortoiseMerge to više nije potrebno. TortoiseMerge parsira zakrpu kako bi pronašao verziju za koju je zakrpa namijenjena i automatski pokušava dobaviti tu verziju iz skladišta verzija. Tada primijenjuje zakrpu i omogućava vam pregled promjena \"pokrpanoj\" datoteci i vaših promjena. Vi tada odlučujete koje promjene želite zadržati." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patchfile for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "No ako koristite Git ili TortoiseMerge to više nije potrebno. TortoiseMerge parsira zakrpu kako bi pronašao verziju za koju je zakrpa namijenjena i automatski pokušava dobaviti tu verziju iz skladišta verzija. Tada primijenjuje zakrpu i omogućava vam pregled promjena \"pokrpanoj\" datoteci i vaših promjena. Vi tada odlučujete koje promjene želite zadržati." #: source/TortoiseMerge_en.xml:231 #: (title) @@ -244,8 +244,8 @@ msgstr "Tada smo potrošili dosta vremena u potrazi za GUI alatom kojim bismo mo #: source/TortoiseMerge_en.xml:264 #: (para) -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff. Also it reduces the size of the executable since TortoiseGit and TortoiseMerge can both use the same dll's." -msgstr "Kako TortoiseGit već upotrebljava Subversion library, koji ima ugrađene spretne razlikovne algoritme, bilo je prirodno da koristimo tu zbirku umjesto GNU programa za razlike. Tako smo dobili uštedu na veličini datoteka programa jer su TortoiseGit i TortoiseMerge upotrebljavali iste dll-ove." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff. Also it reduces the size of the executable since TortoiseGit and TortoiseMerge can both use the same dll's." +msgstr "Kako TortoiseGit već upotrebljava Git library, koji ima ugrađene spretne razlikovne algoritme, bilo je prirodno da koristimo tu zbirku umjesto GNU programa za razlike. Tako smo dobili uštedu na veličini datoteka programa jer su TortoiseGit i TortoiseMerge upotrebljavali iste dll-ove." #: source/TortoiseMerge_en.xml:274 #: (title) @@ -349,8 +349,8 @@ msgstr "Ako želite primjeniti zakrpu morate postaviti datoteku sa zarkpom i dat #: source/TortoiseMerge_en.xml:401 #: (para) -msgid "Currently, only patchfiles in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patchfiles generated by CVS are currently not supported!" -msgstr "Trenutno su podržane samo zakrpe u formatu objedinjenih razlika, te datoteke koje su generirane iz radne kopije Subversiona. Ostali formati kao zakrpe koje generira CVS trenutno nisu podržane!" +msgid "Currently, only patchfiles in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patchfiles generated by CVS are currently not supported!" +msgstr "Trenutno su podržane samo zakrpe u formatu objedinjenih razlika, te datoteke koje su generirane iz radne kopije Gita. Ostali formati kao zakrpe koje generira CVS trenutno nisu podržane!" #: source/TortoiseMerge_en.xml:414 #: (title) @@ -364,8 +364,8 @@ msgstr "Ako TortoiseMerge može parsirati zakrpu pokazat će se mali prozor sa s #: source/TortoiseMerge_en.xml:423 #: (para) -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "No, ne brinite. Ako ste radili sa Subversion-om, možete dobaviti stariju verziju datoteke i razriješiti sukob. U stvari, TortoiseMerge automatski pokušava dobiti stariju datoteku i prikazuje razlike izmjeđu Osnove (starija verzija datoteke) i Moje i Njihove datoteke. Tada možete ručno razrijšti moguće sukobe." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "No, ne brinite. Ako ste radili sa Git-om, možete dobaviti stariju verziju datoteke i razriješiti sukob. U stvari, TortoiseMerge automatski pokušava dobiti stariju datoteku i prikazuje razlike izmjeđu Osnove (starija verzija datoteke) i Moje i Njihove datoteke. Tada možete ručno razrijšti moguće sukobe." #: source/TortoiseMerge_en.xml:434 #: (para) @@ -394,8 +394,8 @@ msgstr "Otvori otvara dijalog za odabir datoteke. A što #: source/TortoiseMerge_en.xml:470 #: (para) -msgid "Save saves any changes you have made. If you have selected Resolve conflicted Subversion status on save in the settings dialog, then Subversion's conflict working files will be deleted automatically if all conflicts were resolved." -msgstr "Snimi sprema sve promjene koje ste napravili. Ako ste u postavkama odabrali Razriješi Subversion status sukoba prilikom snimanja, tada će Subversion dodatne datoteke za obradu sukoba biti obrisane ako su svi sukobi razriješeni." +msgid "Save saves any changes you have made. If you have selected Resolve conflicted Git status on save in the settings dialog, then Git's conflict working files will be deleted automatically if all conflicts were resolved." +msgstr "Snimi sprema sve promjene koje ste napravili. Ako ste u postavkama odabrali Razriješi Git status sukoba prilikom snimanja, tada će Git dodatne datoteke za obradu sukoba biti obrisane ako su svi sukobi razriješeni." #: source/TortoiseMerge_en.xml:481 #: (para) @@ -539,8 +539,8 @@ msgstr "Zanemari velika/mala slova sakriva promjene koje su #: source/TortoiseMerge_en.xml:695 #: (para) -msgid "Compare Whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "Usporedi praznine pokazuje sve promjene u uvlačenju i prazninama unutar retka kao i u dodanim ili obrisanim retcima (kao i Subversion za pohranjivanje verzija)" +msgid "Compare Whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "Usporedi praznine pokazuje sve promjene u uvlačenju i prazninama unutar retka kao i u dodanim ili obrisanim retcima (kao i Git za pohranjivanje verzija)" #: source/TortoiseMerge_en.xml:700 #: (para) @@ -971,8 +971,8 @@ msgstr "Dodaj" #: source/TortoiseMerge_en.xml:1086 #: (para) -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Subversion naredba koja se koristi kako bi se datoteka ili mapa dodala u skladište. Treba znati da će skladište sadržavati nove stavke tek kad sve promjene (tako i dodavanje datoteka/mapa) spremite u skladište naredbom pohrani." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Git naredba koja se koristi kako bi se datoteka ili mapa dodala u skladište. Treba znati da će skladište sadržavati nove stavke tek kad sve promjene (tako i dodavanje datoteka/mapa) spremite u skladište naredbom pohrani." #: source/TortoiseMerge_en.xml:1094 #: (glossterm) @@ -1002,7 +1002,7 @@ msgstr "BDB" #: source/TortoiseMerge_en.xml:1119 #: (para) msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." -msgstr "Berkeley DB. Dobro testirana baza za skladišta, ne može se koristiti na mrežnom disku (već samo na lokalnom). Ovo je bila osnovna baza za Subversion sladišta prije verzije 1.2." +msgstr "Berkeley DB. Dobro testirana baza za skladišta, ne može se koristiti na mrežnom disku (već samo na lokalnom). Ovo je bila osnovna baza za Git sladišta prije verzije 1.2." #: source/TortoiseMerge_en.xml:1126 #: (glossterm) @@ -1011,8 +1011,8 @@ msgstr "Grana" #: source/TortoiseMerge_en.xml:1128 #: (para) -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bugfixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Ovaj termin se često koristi u sustavima za upravljanje verzijama da bi se opisalo što se događa kad se razvoj razdvoji u nekoj točki i dalje se kreće u dvije odvojene staze. Ponekad se napravi nova grana od glavne razvojne tako da se u njoj implementira neka nova mogućnost bez utjecaja na stabilnost glavne razvoje grane. Ponekad se grana odvoji od neke stabline točke kako bi se u njoj radio samo ispravak grešaka, dok se novi razvoj događa na nestabilnoj glavnoj grani. U Subversionu grana je implementirana kao jeftina/lagana kopija." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bugfixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Ovaj termin se često koristi u sustavima za upravljanje verzijama da bi se opisalo što se događa kad se razvoj razdvoji u nekoj točki i dalje se kreće u dvije odvojene staze. Ponekad se napravi nova grana od glavne razvojne tako da se u njoj implementira neka nova mogućnost bez utjecaja na stabilnost glavne razvoje grane. Ponekad se grana odvoji od neke stabline točke kako bi se u njoj radio samo ispravak grešaka, dok se novi razvoj događa na nestabilnoj glavnoj grani. U Gitu grana je implementirana kao jeftina/lagana kopija." #: source/TortoiseMerge_en.xml:1141 #: (glossterm) @@ -1021,8 +1021,8 @@ msgstr "Preuzimanje" #: source/TortoiseMerge_en.xml:1143 #: (para) -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Naredba Subversiona kojom se kreira lokalna radna kopija u praznoj mapi tako da se preuzmu datoteke iz skladišta odgovarajuće, najčešće najnovije verzije." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Naredba Gita kojom se kreira lokalna radna kopija u praznoj mapi tako da se preuzmu datoteke iz skladišta odgovarajuće, najčešće najnovije verzije." #: source/TortoiseMerge_en.xml:1150 #: (glossterm) @@ -1031,8 +1031,8 @@ msgstr "Čišćenje" #: source/TortoiseMerge_en.xml:1152 #: (para) -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Da citiramo Subversion knjigu: Rekurzivno čisti radnu kopiju, tako da uklanja zaključavanja i nastavlja nezavršene operacije. Ako ikada dobijete grešku radna kopije je zaključana, pokrenite ovu naredbu da biste uklonili zaključavanja i dobili vašu radnu kopiju u upotrebljivom stanju. Treba znati da se termin zaključavanja ovdje koristi za lokalno zakljućavanje datoteka u datotečnom sustavu, a ne na zaključavanje u skladištu." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Da citiramo Git knjigu: Rekurzivno čisti radnu kopiju, tako da uklanja zaključavanja i nastavlja nezavršene operacije. Ako ikada dobijete grešku radna kopije je zaključana, pokrenite ovu naredbu da biste uklonili zaključavanja i dobili vašu radnu kopiju u upotrebljivom stanju. Treba znati da se termin zaključavanja ovdje koristi za lokalno zakljućavanje datoteka u datotečnom sustavu, a ne na zaključavanje u skladištu." #: source/TortoiseMerge_en.xml:1167 #: (glossterm) @@ -1041,7 +1041,7 @@ msgstr "Pohrana" #: source/TortoiseMerge_en.xml:1169 #: (para) -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "Ova naredba se koristi da bi proslijedila promjene u vašoj radnoj kopiji nazad u skladište i time kreirala novu reviziju u skladištu." #: source/TortoiseMerge_en.xml:1177 @@ -1051,8 +1051,8 @@ msgstr "Sukob" #: source/TortoiseMerge_en.xml:1179 #: (para) -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Kad se promjene iz skladišta stapaju sa lokalnim promjenama, ponekad se te promjene dogode na istim redcima. U tom slučaju Subversion ne može automatski odlučiti koju verziju da koristi i tada se kaže da je takva datoteka u sukobu. Morate sami ručno urediti datoteku da biste razriješili sukob i to prije pohranjivanja novih promjena." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Kad se promjene iz skladišta stapaju sa lokalnim promjenama, ponekad se te promjene dogode na istim redcima. U tom slučaju Git ne može automatski odlučiti koju verziju da koristi i tada se kaže da je takva datoteka u sukobu. Morate sami ručno urediti datoteku da biste razriješili sukob i to prije pohranjivanja novih promjena." #: source/TortoiseMerge_en.xml:1189 #: (glossterm) @@ -1061,8 +1061,8 @@ msgstr "Kopiranje" #: source/TortoiseMerge_en.xml:1191 #: (para) -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "U Subversion skladištu možete napraviti kopiju jedne datoteke ili cijelog stabla mapa. Ovo je implementirano kao jeftina kopija što izgleda kao veza prema originalnoj datotekci u smislu da nova kopija gotovo da ne zauzima ništa mjesta. Izrada kopije čuva povijest stavke u kopiranju, tako da možete pratiti izmjene i prije trenutka izrade kopije." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "U Git skladištu možete napraviti kopiju jedne datoteke ili cijelog stabla mapa. Ovo je implementirano kao jeftina kopija što izgleda kao veza prema originalnoj datotekci u smislu da nova kopija gotovo da ne zauzima ništa mjesta. Izrada kopije čuva povijest stavke u kopiranju, tako da možete pratiti izmjene i prije trenutka izrade kopije." #: source/TortoiseMerge_en.xml:1201 #: (glossterm) @@ -1101,8 +1101,8 @@ msgstr "FSFS" #: source/TortoiseMerge_en.xml:1234 #: (para) -msgid "FS Filesystem. A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "FS datotečni sustav. Ovo je posebni Subversion sustav za skladišta. Može se koristiti i na mrežnim diskovima. Ovaj sustav je osnovni za skladišta Subversiona od verzije 1.2." +msgid "FS Filesystem. A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "FS datotečni sustav. Ovo je posebni Git sustav za skladišta. Može se koristiti i na mrežnim diskovima. Ovaj sustav je osnovni za skladišta Gita od verzije 1.2." #: source/TortoiseMerge_en.xml:1241 #: (glossterm) @@ -1131,8 +1131,8 @@ msgstr "Uvoz" #: source/TortoiseMerge_en.xml:1259 #: (para) -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Subversion naredba za uvoz cijele mape u skladište i to jednoj reviziji." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Git naredba za uvoz cijele mape u skladište i to jednoj reviziji." #: source/TortoiseMerge_en.xml:1266 #: (glossterm) @@ -1177,7 +1177,7 @@ msgstr "Proces u kojem se promjene iz skladišta prenose u radnu kopiju bez bris #: source/TortoiseMerge_en.xml:1302 #: (para) msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseGit's Merge command." -msgstr "Stapanje se automatski poziva kad se obnavlja radna kopija. Također se mogu stapati i promjene iz druge grane koristeći Subversion naredbu Stopi." +msgstr "Stapanje se automatski poziva kad se obnavlja radna kopija. Također se mogu stapati i promjene iz druge grane koristeći Git naredbu Stopi." #: source/TortoiseMerge_en.xml:1310 #: (glossterm) @@ -1186,8 +1186,8 @@ msgstr "Zakrpa" #: source/TortoiseMerge_en.xml:1312 #: (para) -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Ako vaša radna kopija ima promjene samo u tekst datotekama, moguće je koristiti Subversion naredbu Razlike kako bi se izradila datoteka sažetka svih promjena u formatu objedinjenih razlika. Datoteka ovog tipa se naziva zakrpa, i može se poslati elektroničkom poštom nekome tko će primjeniti vaše promjene na svojoj radnoj kopiji. Netko bez prava pohrane može tako napraviti promjene i poslati zakrpu onome tko je autoriziran pohraniti novu reviziju u skladištu. Također, ako niste sigurni da su vaše promjene \"dobre\" za skladište, možete na ovaj način poslati promjene nekome tko će ih pregledati (bez prethodne pohrane u skladište)." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Ako vaša radna kopija ima promjene samo u tekst datotekama, moguće je koristiti Git naredbu Razlike kako bi se izradila datoteka sažetka svih promjena u formatu objedinjenih razlika. Datoteka ovog tipa se naziva zakrpa, i može se poslati elektroničkom poštom nekome tko će primjeniti vaše promjene na svojoj radnoj kopiji. Netko bez prava pohrane može tako napraviti promjene i poslati zakrpu onome tko je autoriziran pohraniti novu reviziju u skladištu. Također, ako niste sigurni da su vaše promjene \"dobre\" za skladište, možete na ovaj način poslati promjene nekome tko će ih pregledati (bez prethodne pohrane u skladište)." #: source/TortoiseMerge_en.xml:1325 #: (glossterm) @@ -1196,8 +1196,8 @@ msgstr "Svojstvo" #: source/TortoiseMerge_en.xml:1327 #: (para) -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Osim praćenja promjena u datotekama, Subversion omogućava da datotekama ili mapama dodajete metapodatke koji se također pohranjuju u revizijama. Ove metapodatke nazivamo svojstvima svakog pojedine stavke (datoteke ili mape). Svako svojstvo ima svoje ime i vrijednost. Subversion ima posebna svojstva koja koristi interno, kao svn:eol-style. TortoiseGit također ima svoja svojstva kao tsvn:logminsize. I vi možete dodati svoja svojstva, te im odabrati i imena i vrijednosti. " +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Osim praćenja promjena u datotekama, Git omogućava da datotekama ili mapama dodajete metapodatke koji se također pohranjuju u revizijama. Ove metapodatke nazivamo svojstvima svakog pojedine stavke (datoteke ili mape). Svako svojstvo ima svoje ime i vrijednost. Git ima posebna svojstva koja koristi interno, kao svn:eol-style. TortoiseGit također ima svoja svojstva kao tsvn:logminsize. I vi možete dodati svoja svojstva, te im odabrati i imena i vrijednosti. " #: source/TortoiseMerge_en.xml:1340 #: (glossterm) @@ -1241,8 +1241,8 @@ msgstr "Vratiti na staro" #: source/TortoiseMerge_en.xml:1382 #: (para) -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion lokalno pohranjuje prijašnju kopiju svake datoteke kakva je bila kad ste je zadnji put obnovili vašu radnu kopiju. Ako ste napravili izmjene i odulučili ih ponuištiti, možete kosristi naredbu Vrati na staro kako biste datoteku vratili na njezinu prijašnju kopiju." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git lokalno pohranjuje prijašnju kopiju svake datoteke kakva je bila kad ste je zadnji put obnovili vašu radnu kopiju. Ako ste napravili izmjene i odulučili ih ponuištiti, možete kosristi naredbu Vrati na staro kako biste datoteku vratili na njezinu prijašnju kopiju." #: source/TortoiseMerge_en.xml:1391 #: (glossterm) @@ -1276,13 +1276,13 @@ msgstr "SVN" #: source/TortoiseMerge_en.xml:1423 #: (para) -msgid "A frequently-used abbreviation for Subversion." -msgstr "Često korištena skraćenica za Subversion." +msgid "A frequently-used abbreviation for Git." +msgstr "Često korištena skraćenica za Git." #: source/TortoiseMerge_en.xml:1426 #: (para) -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Ime posebnog Subversion protokola kojeg koristi svnserve server Subversion kladišta." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Ime posebnog Git protokola kojeg koristi svnserve server Git kladišta." #: source/TortoiseMerge_en.xml:1433 #: (glossterm) @@ -1301,8 +1301,8 @@ msgstr "Obnovi" #: source/TortoiseMerge_en.xml:1449 #: (para) -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Subversion naredba povlači zadnje izmjene iz skladišta u vašu radnu kopiju, stapajući sve promjene iz skladišta sa vašim lokalnim izmjenama u radnoj kopiji." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Git naredba povlači zadnje izmjene iz skladišta u vašu radnu kopiju, stapajući sve promjene iz skladišta sa vašim lokalnim izmjenama u radnoj kopiji." #: source/TortoiseMerge_en.xml:1457 #: (glossterm) diff --git a/doc/po/TortoiseMerge_id.po b/doc/po/TortoiseMerge_id.po index 34e7acd..61b2cb4 100644 --- a/doc/po/TortoiseMerge_id.po +++ b/doc/po/TortoiseMerge_id.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2009-01-01 22:35+0700\n" "Last-Translator: Thomas Edwin Santosa \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -232,8 +232,8 @@ msgstr "Ketika bekerja pada file teks, contohnya file sumber dalam bahasa pemrog # Indonesian#: source/TortoiseMerge_en.xml:197 #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "Jika Anda bekerja dengan sistem kontrol versi (contohnya Subversion) maka Anda biasanya akan menghadapi konflik ketika Anda memutahirkan copy pekerjaan Anda. Ini terjadi jika orang lain mengubah bagian yang sama dari file yang sama yang Anda kerjakan. Maka Anda harus menyelesaikan konflik itu secara manual. Disinilah TortoiseMerge bisa membantu Anda." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "Jika Anda bekerja dengan sistem kontrol versi (contohnya Git) maka Anda biasanya akan menghadapi konflik ketika Anda memutahirkan copy pekerjaan Anda. Ini terjadi jika orang lain mengubah bagian yang sama dari file yang sama yang Anda kerjakan. Maka Anda harus menyelesaikan konflik itu secara manual. Disinilah TortoiseMerge bisa membantu Anda." # Indonesian#: source/TortoiseMerge_en.xml:205 #. (para) @@ -258,8 +258,8 @@ msgstr "Suatu konflik bisa juga terjadi jika Anda mencoba menerapkan sebuah berk # Indonesian#: source/TortoiseMerge_en.xml:219 #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "Tetapi sekarang dengan TortoiseMerge ini tidak perlu lagi - setidaknya tidak jika Anda bekerja dengan sistem kontrol versi seperti Subversion. TortoiseMerge mengurai berkas tambalan untuk revisi/versi dari tambalan yang dibuat untuk dan secara otomatis mencoba mengambil versi tertentu dari kontrol-sumber Anda. Kemudian menerapkan tambalan dan memungkinkan Anda meninjau kedua perubahan Anda pada berkas, dan milik mereka. Lalu Anda bisa memutuskan perubahan mana yang ingin Anda simpan." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "Tetapi sekarang dengan TortoiseMerge ini tidak perlu lagi - setidaknya tidak jika Anda bekerja dengan sistem kontrol versi seperti Git. TortoiseMerge mengurai berkas tambalan untuk revisi/versi dari tambalan yang dibuat untuk dan secara otomatis mencoba mengambil versi tertentu dari kontrol-sumber Anda. Kemudian menerapkan tambalan dan memungkinkan Anda meninjau kedua perubahan Anda pada berkas, dan milik mereka. Lalu Anda bisa memutuskan perubahan mana yang ingin Anda simpan." # Indonesian#: source/TortoiseMerge_en.xml:233 #. (title) @@ -288,8 +288,8 @@ msgstr "Maka kami meluangkan banyak waktu, mencari internet untuk piranti GUI ya # Indonesian#: source/TortoiseMerge_en.xml:268 #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "Karena TortoiseGit sudah menggunakan pustaka Subversion, yang mempunyai mesin pembeda secara pabrikan, ini menjadi alami untuk menggunakan librari ini daripada GNU diff." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "Karena TortoiseGit sudah menggunakan pustaka Git, yang mempunyai mesin pembeda secara pabrikan, ini menjadi alami untuk menggunakan librari ini daripada GNU diff." #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -303,8 +303,8 @@ msgstr "Melihat perbedaan di antara dua berkas dan menggabungkan perubahan-perub #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." -msgstr "Menyunting konflik di antara perubahan-perubahan lokal dan perubahan-perubahan dalam repositori Subversion setelah suatu update." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." +msgstr "Menyunting konflik di antara perubahan-perubahan lokal dan perubahan-perubahan dalam repositori Git setelah suatu update." #. (para) #: ../source/TortoiseMerge_en.xml:294 @@ -384,7 +384,7 @@ msgstr "Menerapkan Patch" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." msgstr "" #. (para) @@ -504,8 +504,8 @@ msgstr "Jika TortoiseMerge bisa mengurai patchfile ia akan memperlihatkan kepada #. (para) #: ../source/TortoiseMerge_en.xml:493 #, fuzzy -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "Tapi jangan khawatir. Jika Anda bekerja dengan Subversion Anda bisa mengambil versi file lama dan menyelesaikan konflik tersebut. Kenyataannya, TortoiseMerge secara otomatis mencoba mendapatkan versi file lama itu dan kemudian memperlihatkannya kepada Anda perbedaan di antara Base (file versi lebih lama), Saya (file di mana copy pekerjaan Anda saat ini) dan Mereka (versi file lama dengan patch yang sudah diterapkan). Selanjutnya Anda bisa menyelesaikan kemungkinan konflik secara manual." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "Tapi jangan khawatir. Jika Anda bekerja dengan Git Anda bisa mengambil versi file lama dan menyelesaikan konflik tersebut. Kenyataannya, TortoiseMerge secara otomatis mencoba mendapatkan versi file lama itu dan kemudian memperlihatkannya kepada Anda perbedaan di antara Base (file versi lebih lama), Saya (file di mana copy pekerjaan Anda saat ini) dan Mereka (versi file lama dengan patch yang sudah diterapkan). Selanjutnya Anda bisa menyelesaikan kemungkinan konflik secara manual." # Indonesian#: source/TortoiseMerge_en.xml:438 #. (para) @@ -718,7 +718,7 @@ msgstr "Jika Anda dalam tampilan tiga pane (kadang kala disebut tampil #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." msgstr "" # Indonesian#: source/TortoiseMerge_en.xml:643 @@ -783,8 +783,8 @@ msgstr "Jika Anda ingin menerapkan patchfile Anda harus menetapkan kedua path te #. (para) #: ../source/TortoiseMerge_en.xml:873 #, fuzzy -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" -msgstr "Saat ini, hanya patchfiles dalam Format Unified Diff yang didukung. Dan hanya file yang dibuat dari working copy Subversion. Format lain seperti patchfiles yang dibuat oleh CVS saat ini tidak didukung!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" +msgstr "Saat ini, hanya patchfiles dalam Format Unified Diff yang didukung. Dan hanya file yang dibuat dari working copy Git. Format lain seperti patchfiles yang dibuat oleh CVS saat ini tidak didukung!" # Indonesian#: source/TortoiseMerge_en.xml:673 #. (title) @@ -837,8 +837,8 @@ msgstr "Kode warna perubahan-perubahan sebaris menggunakan # Indonesian#: source/TortoiseMerge_en.xml:705 #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "Bandingkan spasi putih memperlihatkan semua perubahan dalam indentasi dan spasi putih sebaris karena baris ditambah/dihapus (inilah bagaimana Subversion memperlakukan perubahan demikian)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "Bandingkan spasi putih memperlihatkan semua perubahan dalam indentasi dan spasi putih sebaris karena baris ditambah/dihapus (inilah bagaimana Git memperlakukan perubahan demikian)." # Indonesian#: source/TortoiseMerge_en.xml:711 #. (para) @@ -1427,8 +1427,8 @@ msgstr "Add (Tambah)" # Indonesian#: source/TortoiseMerge_en.xml:1096 #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Perintah Subversion yang digunakan untuk menambah file atau direktori ke copy pekerjaan Anda. Item baru ditambahkan ke repositori saat Anda komit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Perintah Git yang digunakan untuk menambah file atau direktori ke copy pekerjaan Anda. Item baru ditambahkan ke repositori saat Anda komit." # Indonesian#: source/TortoiseMerge_en.xml:1104 #. (glossterm) @@ -1476,8 +1476,8 @@ msgstr "Branch (Cabang)" #. (para) #: ../source/TortoiseMerge_en.xml:1402 #, fuzzy -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Batasan yang sering digunakan dalam sistem kontrol revisi untuk menjelaskan apa yang terjadi ketika garpu pengembangan pada titik tertentu dan mengikuti 2 path terpisah. Anda bisa membuat cabang di luar barisan pengembangan utama untuk mengembangkan fitur baru tanpa membuat barisan utama menjadi tidak stabil. Atau Anda bisa mencabangkan rilis stabil ke mana Anda hanya membuat pembetulan bug, sementara pengembangan baru menempati batang tidak stabil. Dalam Subversion cabang diimplementasikan sebagai copy murah." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Batasan yang sering digunakan dalam sistem kontrol revisi untuk menjelaskan apa yang terjadi ketika garpu pengembangan pada titik tertentu dan mengikuti 2 path terpisah. Anda bisa membuat cabang di luar barisan pengembangan utama untuk mengembangkan fitur baru tanpa membuat barisan utama menjadi tidak stabil. Atau Anda bisa mencabangkan rilis stabil ke mana Anda hanya membuat pembetulan bug, sementara pengembangan baru menempati batang tidak stabil. Dalam Git cabang diimplementasikan sebagai copy murah." # Indonesian#: source/TortoiseMerge_en.xml:1152 #. (glossterm) @@ -1488,8 +1488,8 @@ msgstr "Checkout" # Indonesian#: source/TortoiseMerge_en.xml:1154 #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Perintah Subversion yang membuat copy pekerjaan lokal dalam direktori kosong dengan mengunduh file berversi dari repositori." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Perintah Git yang membuat copy pekerjaan lokal dalam direktori kosong dengan mengunduh file berversi dari repositori." # Indonesian#: source/TortoiseMerge_en.xml:1161 #. (glossterm) @@ -1501,8 +1501,8 @@ msgstr "Cleanup (Bersihkan)" #. (para) #: ../source/TortoiseMerge_en.xml:1426 #, fuzzy -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Mengutip dari buku Subversion: Secara rekursif membersihkan copy pekerjaan, menghapus kuncian dan melanjutkan operasi yang belum selesai. Jika Anda pernah mendapatkan kesalahan copy pekerjaan dikunci, jalankan perintah ini untuk menghapus kuncian basi dan mendapatkan copy pekerjaan Anda kedalam kondisi yang berguna lagi. Catatan bahwa konteks kunci merujuk ke penguncian sistem file lokal, bukan penguncian repositori." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Mengutip dari buku Git: Secara rekursif membersihkan copy pekerjaan, menghapus kuncian dan melanjutkan operasi yang belum selesai. Jika Anda pernah mendapatkan kesalahan copy pekerjaan dikunci, jalankan perintah ini untuk menghapus kuncian basi dan mendapatkan copy pekerjaan Anda kedalam kondisi yang berguna lagi. Catatan bahwa konteks kunci merujuk ke penguncian sistem file lokal, bukan penguncian repositori." # Indonesian#: source/TortoiseMerge_en.xml:1178 #. (glossterm) @@ -1513,8 +1513,8 @@ msgstr "Commit (Komit)" # Indonesian#: source/TortoiseMerge_en.xml:1180 #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Perintah Subversion ini digunakan untuk mengoper perubahan dalam copy pekerjaan Anda kembali ke dalam repositori, membuat revisi repositori baru." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Perintah Git ini digunakan untuk mengoper perubahan dalam copy pekerjaan Anda kembali ke dalam repositori, membuat revisi repositori baru." # Indonesian#: source/TortoiseMerge_en.xml:762 #. (glossterm) @@ -1525,8 +1525,8 @@ msgstr "Conflict (Konflik)" # Indonesian#: source/TortoiseMerge_en.xml:1190 #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Ketika perubahan dari repositori digabung dengan perubahan lokal, ada kalanya perubahan itu terjadi pada baris yang sama. Dalam hal ini Subversion tidak bisa secara otomatis menentukan versi yang mana untuk digunakan dan file yang dinyatakan sebagai konflik. Anda harus mengedit file secara manual dan menyelesaikan konflik sebelum Anda bisa mengkomit perubahan selanjutnya." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Ketika perubahan dari repositori digabung dengan perubahan lokal, ada kalanya perubahan itu terjadi pada baris yang sama. Dalam hal ini Git tidak bisa secara otomatis menentukan versi yang mana untuk digunakan dan file yang dinyatakan sebagai konflik. Anda harus mengedit file secara manual dan menyelesaikan konflik sebelum Anda bisa mengkomit perubahan selanjutnya." # Indonesian#: source/TortoiseMerge_en.xml:1201 #. (glossterm) @@ -1537,8 +1537,8 @@ msgstr "Copy" # Indonesian#: source/TortoiseMerge_en.xml:1203 #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "Dalam repositori Subversion Anda bisa membuat copy dari file tunggal atau susunan keseluruhan. Ini diimplementasikan sebagai copy murah yang bertindak sedikit mirip link ke original di dalamnya hampir tidak ada ruang. Membuat copy menjaga sejarah dari item dalam copy, dengan demikian Anda bisa melacak perubahan yang dibuat sebelum copy dibuat." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "Dalam repositori Git Anda bisa membuat copy dari file tunggal atau susunan keseluruhan. Ini diimplementasikan sebagai copy murah yang bertindak sedikit mirip link ke original di dalamnya hampir tidak ada ruang. Membuat copy menjaga sejarah dari item dalam copy, dengan demikian Anda bisa melacak perubahan yang dibuat sebelum copy dibuat." # Indonesian#: source/TortoiseMerge_en.xml:1213 #. (glossterm) @@ -1587,8 +1587,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 #, fuzzy -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "FS Filesystem. Backend sistem file untuk repositori hak milik Subversion. Bisa digunakan pada jaringan berbagi. Standar untuk repositori 1.2 dan lebih baru." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "FS Filesystem. Backend sistem file untuk repositori hak milik Git. Bisa digunakan pada jaringan berbagi. Standar untuk repositori 1.2 dan lebih baru." # Indonesian#: source/TortoiseMerge_en.xml:1253 #. (glossterm) @@ -1623,8 +1623,8 @@ msgstr "Import (Impor)" # Indonesian#: source/TortoiseMerge_en.xml:1271 #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Perintah Subversion untuk mengimpor keseluruhan hirarki folder ke dalam revisi tunggal." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Perintah Git untuk mengimpor keseluruhan hirarki folder ke dalam revisi tunggal." # Indonesian#: source/TortoiseMerge_en.xml:1278 #. (glossterm) @@ -1690,8 +1690,8 @@ msgstr "Patch" # Indonesian#: source/TortoiseMerge_en.xml:1324 #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Jika copy pekerjaan sudah berubah ke hanya file teks, ini memungkinkan untuk menggunakan perintah Diff Subversion untuk menghasilkan ringkasan file tunggal dari perubahan itu dalam format Unified Diff. File dari tipe ini sering dirujuk sebagai Patch, dan bisa diemail ke orang lain (atau daftar mailing) dan diterapkan ke copy pekerjaan lain. Seseorang tanpa akses komit bisa membuat perubahan dan mengirimkan file patch untuk pengkomit yang diotorisasi untuk menerapkan. Atau jika Anda tidak yakin mengenai perubahan Anda bisa mengirimkan patch untuk ditinjau orang lain." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Jika copy pekerjaan sudah berubah ke hanya file teks, ini memungkinkan untuk menggunakan perintah Diff Git untuk menghasilkan ringkasan file tunggal dari perubahan itu dalam format Unified Diff. File dari tipe ini sering dirujuk sebagai Patch, dan bisa diemail ke orang lain (atau daftar mailing) dan diterapkan ke copy pekerjaan lain. Seseorang tanpa akses komit bisa membuat perubahan dan mengirimkan file patch untuk pengkomit yang diotorisasi untuk menerapkan. Atau jika Anda tidak yakin mengenai perubahan Anda bisa mengirimkan patch untuk ditinjau orang lain." # Indonesian#: source/TortoiseMerge_en.xml:1338 #. (glossterm) @@ -1702,8 +1702,8 @@ msgstr "Property (Properti)" # Indonesian#: source/TortoiseMerge_en.xml:1340 #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Sebagai tambahan ke direktori dan file versi Anda, Subversion membolehkan Anda untuk menambahkan metadata yang diversi - dirujuk sebagai properties ke setiap direktori dan file yang diversi Anda. Setiap properti mempunyai nama dan nilai, mirip kunci registri. Subversion mempunyai beberapa properti khusus yang digunakan secara internal, seperti svn:eol-style. TortoiseGit juga mempunyai beberapa, seperti tsvn:logminsize. Anda bisa menambah properti Anda sendiri dengan setiap nama dan nilai yang Anda pilih." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Sebagai tambahan ke direktori dan file versi Anda, Git membolehkan Anda untuk menambahkan metadata yang diversi - dirujuk sebagai properties ke setiap direktori dan file yang diversi Anda. Setiap properti mempunyai nama dan nilai, mirip kunci registri. Git mempunyai beberapa properti khusus yang digunakan secara internal, seperti svn:eol-style. TortoiseGit juga mempunyai beberapa, seperti tsvn:logminsize. Anda bisa menambah properti Anda sendiri dengan setiap nama dan nilai yang Anda pilih." # Indonesian#: source/TortoiseMerge_en.xml:1353 #. (glossterm) @@ -1756,8 +1756,8 @@ msgstr "Revert (Pulihkan)" # Indonesian#: source/TortoiseMerge_en.xml:1395 #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion memelihara copy murni lokal dari setiap file seperti setelah saat terakhir Anda memutahirkan copy pekerjaan Anda. Jika Anda telah membuat perubahan dan menentukan Anda ingin membatalkannya, Anda bisa menggunakan perintah pulihkan untuk kembali ke copy murni." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git memelihara copy murni lokal dari setiap file seperti setelah saat terakhir Anda memutahirkan copy pekerjaan Anda. Jika Anda telah membuat perubahan dan menentukan Anda ingin membatalkannya, Anda bisa menggunakan perintah pulihkan untuk kembali ke copy murni." # Indonesian#: source/TortoiseMerge_en.xml:1404 #. (glossterm) @@ -1798,14 +1798,14 @@ msgstr "SVN" # Indonesian#: source/TortoiseMerge_en.xml:1436 #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Singkatan dari Subversion yang sering digunakan." +msgid "A frequently-used abbreviation for Git." +msgstr "Singkatan dari Git yang sering digunakan." # Indonesian#: source/TortoiseMerge_en.xml:1439 #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Nama dari protokol bebas Subversion yang digunakan oleh server repositori svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Nama dari protokol bebas Git yang digunakan oleh server repositori svnserve." # Indonesian#: source/TortoiseMerge_en.xml:1446 #. (glossterm) @@ -1828,8 +1828,8 @@ msgstr "Update (Mutahirkan)" # Indonesian#: source/TortoiseMerge_en.xml:1462 #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Perintah Subversion ini menarik perubahan terbaru dari repositori ke dalam copy pekerjaan Anda, menggabung setiap perubahan oleh orang lain dengan perubahan lokal dalam copy pekerjaan." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Perintah Git ini menarik perubahan terbaru dari repositori ke dalam copy pekerjaan Anda, menggabung setiap perubahan oleh orang lain dengan perubahan lokal dalam copy pekerjaan." # Indonesian#: source/TortoiseMerge_en.xml:1470 #. (glossterm) diff --git a/doc/po/TortoiseMerge_ja.po b/doc/po/TortoiseMerge_ja.po index 6adcfe6..636ebd6 100644 --- a/doc/po/TortoiseMerge_ja.po +++ b/doc/po/TortoiseMerge_ja.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2008-11-17 23:55+0900\n" "Last-Translator: KURASAWA Nozomu \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -213,8 +213,8 @@ msgstr "お好みのプログラム言語のソースファイルや、ドキュ #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "バージョン管理システム (例: Subversion) を利用して作業を行っていると、作業コピーの更新時に 競合 することがあります。これは作業を行ったファイルのある部分に対して、他の誰かが同じ部分を変更したことによって起こります。この競合は手動で解決しなければなりません。TortoiseMerge はこの作業を助けてくれます。" +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "バージョン管理システム (例: Git) を利用して作業を行っていると、作業コピーの更新時に 競合 することがあります。これは作業を行ったファイルのある部分に対して、他の誰かが同じ部分を変更したことによって起こります。この競合は手動で解決しなければなりません。TortoiseMerge はこの作業を助けてくれます。" #. (para) #: ../source/TortoiseMerge_en.xml:206 @@ -235,8 +235,8 @@ msgstr "古くなってしまったパッチファイルを適用しようとし #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "ですが、TortoiseMerge を使うとこういったことがもう必要ありません。少なくとも Subversion のようなバージョン管理システムを使用する限りにおいては。TortoiseMerge はパッチを作成したリビジョン・バージョンを解析し、ソース管理システムからその特定のバージョンを自動的に取得します。その後パッチを適用し、自分の行った変更と他の人の行った変更の両方を確認できるようにします。これにより、変更点を保持するかどうか決めることができます。" +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "ですが、TortoiseMerge を使うとこういったことがもう必要ありません。少なくとも Git のようなバージョン管理システムを使用する限りにおいては。TortoiseMerge はパッチを作成したリビジョン・バージョンを解析し、ソース管理システムからその特定のバージョンを自動的に取得します。その後パッチを適用し、自分の行った変更と他の人の行った変更の両方を確認できるようにします。これにより、変更点を保持するかどうか決めることができます。" #. (title) #: ../source/TortoiseMerge_en.xml:235 @@ -260,8 +260,8 @@ msgstr "パッチファイルを適用する GUI ツールをインターネッ #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "TortoiseGit は既に (すばらしい差分エンジンを内蔵した) Subversion ライブラリを使用していたので、GNU diff の代わりにこのライブラリを使用するのは自然なことでした。" +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "TortoiseGit は既に (すばらしい差分エンジンを内蔵した) Git ライブラリを使用していたので、GNU diff の代わりにこのライブラリを使用するのは自然なことでした。" #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -275,8 +275,8 @@ msgstr "2 ファイルの差分を表示し、変更点をマージしたり、 #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." -msgstr "ローカルな変更と、更新で取得した Subversion のリポジトリにある変更との競合の編集を行えます。" +msgid "Editing conflicts between local changes and changes in the Git repository following an update." +msgstr "ローカルな変更と、更新で取得した Git のリポジトリにある変更との競合の編集を行えます。" #. (para) #: ../source/TortoiseMerge_en.xml:294 @@ -349,8 +349,8 @@ msgstr "パッチを適用" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." -msgstr "パッチファイルは、Subversion の unified diff ファイルで、変更を適用するファイルの一覧が含まれています。パッチは、あなたが変更点を確認してからコミットできるように、他の開発者によって作成されたかもしれません。また、TortoiseGit が 2 つのフォルダを比較する際に、内部的に作成したかもしれません。これは、リポジトリリビジョンと作業コピーフォルダを比較したり、2 つの異なるリポジトリリビジョンを比較したり、2 つの異なるリポジトリパスを比較したりすると発生します。" +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgstr "パッチファイルは、Git の unified diff ファイルで、変更を適用するファイルの一覧が含まれています。パッチは、あなたが変更点を確認してからコミットできるように、他の開発者によって作成されたかもしれません。また、TortoiseGit が 2 つのフォルダを比較する際に、内部的に作成したかもしれません。これは、リポジトリリビジョンと作業コピーフォルダを比較したり、2 つの異なるリポジトリリビジョンを比較したり、2 つの異なるリポジトリパスを比較したりすると発生します。" #. (para) #: ../source/TortoiseMerge_en.xml:380 @@ -451,8 +451,8 @@ msgstr "TortoiseMerge がパッチファイルをパースすると、そのパ #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "でも、ご心配なく。Subversion で作業していれば、古いバージョンのファイルを取り出し、競合を解消できます。実際、TortoiseMerge は自動で古いバージョンのファイルを取り出し、Base (古いバージョンのファイル)、Mine (現在作業コピーにあるファイル)、Theirs (古いバージョンのファイルにパッチが当たったファイル) の差分を表示します。以上から手動で競合を解消できます。" +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "でも、ご心配なく。Git で作業していれば、古いバージョンのファイルを取り出し、競合を解消できます。実際、TortoiseMerge は自動で古いバージョンのファイルを取り出し、Base (古いバージョンのファイル)、Mine (現在作業コピーにあるファイル)、Theirs (古いバージョンのファイルにパッチが当たったファイル) の差分を表示します。以上から手動で競合を解消できます。" #. (para) #: ../source/TortoiseMerge_en.xml:504 @@ -651,8 +651,8 @@ msgstr "3 ペインビュー (時に マージビュー と #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." -msgstr "時には、TortoiseMerge では競合していないのに、Subversion で競合が発生したと印がつけられることがあります。これは、選択した空白の扱いによるものかもしれません。行末や空白の変更を無視するようにした場合、その行は 競合無視 アイコンを用いて印がつけられます。競合を解消するために、どのバージョンを採用するか選択する必要があります。" +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgstr "時には、TortoiseMerge では競合していないのに、Git で競合が発生したと印がつけられることがあります。これは、選択した空白の扱いによるものかもしれません。行末や空白の変更を無視するようにした場合、その行は 競合無視 アイコンを用いて印がつけられます。競合を解消するために、どのバージョンを採用するか選択する必要があります。" #. (para) #: ../source/TortoiseMerge_en.xml:804 @@ -701,8 +701,8 @@ msgstr "パッチファイルを適用する場合、パッチファイルその #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" -msgstr "現在、Unified Diff Format しかサポートしていません。さらに、Subversion の作業コピーで作成されたファイルのみです。CVS で作成されたパッチファイルのような他の形式は、現在サポートしていません!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" +msgstr "現在、Unified Diff Format しかサポートしていません。さらに、Git の作業コピーで作成されたファイルのみです。CVS で作成されたパッチファイルのような他の形式は、現在サポートしていません!" #. (title) #: ../source/TortoiseMerge_en.xml:884 @@ -746,8 +746,8 @@ msgstr "変更された行内の色コード メイン表 #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "空白を比較 行の追加・削除と同様 (Subversion の扱いと同様) に、インデントや行内の空白の変更を示します。" +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "空白を比較 行の追加・削除と同様 (Git の扱いと同様) に、インデントや行内の空白の変更を示します。" #. (para) #: ../source/TortoiseMerge_en.xml:924 @@ -1253,8 +1253,8 @@ msgstr "追加" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "ファイルやディレクトリをリポジトリに追加する Subversion コマンド。コミットするとリポジトリに追加されます。" +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "ファイルやディレクトリをリポジトリに追加する Git コマンド。コミットするとリポジトリに追加されます。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1368 @@ -1293,8 +1293,8 @@ msgstr "ブランチ" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "ある点で開発が2つの独立したパスに分岐したことをと表す、リビジョン管理システムの用語です。メインラインを不安定にせずに新機能の開発を行うように、メインの開発ラインからブランチを作成できます。また、今後バグフィックスしか行わない安定版リリースのブランチを作成し、新機能の開発は不安定なトランクで行えます。Subversion のブランチは、チープコピー として実装されています。" +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "ある点で開発が2つの独立したパスに分岐したことをと表す、リビジョン管理システムの用語です。メインラインを不安定にせずに新機能の開発を行うように、メインの開発ラインからブランチを作成できます。また、今後バグフィックスしか行わない安定版リリースのブランチを作成し、新機能の開発は不安定なトランクで行えます。Git のブランチは、チープコピー として実装されています。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 @@ -1303,8 +1303,8 @@ msgstr "チェックアウト" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "空のディレクトリにリポジトリからバージョン管理下のファイルをダウンロードし、手元の作業コピーを作成する Subversion コマンドです。" +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "空のディレクトリにリポジトリからバージョン管理下のファイルをダウンロードし、手元の作業コピーを作成する Git コマンドです。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1424 @@ -1313,8 +1313,8 @@ msgstr "クリーンアップ" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "以下 Subversion book から引用します。作業コピーを再帰的にクリーンアップ (ロックの削除、未完操作の回復) を行います。作業コピーがロックされています というエラーが出続ける場合、このコマンドを実行し、古くなったロックを削除し、作業コピーをまた使えるようにします。 ここで言う ロック は、ファイルシステムのロックを指しており、リポジトリのロックではないことに注意してください。" +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "以下 Git book から引用します。作業コピーを再帰的にクリーンアップ (ロックの削除、未完操作の回復) を行います。作業コピーがロックされています というエラーが出続ける場合、このコマンドを実行し、古くなったロックを削除し、作業コピーをまた使えるようにします。 ここで言う ロック は、ファイルシステムのロックを指しており、リポジトリのロックではないことに注意してください。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1441 @@ -1323,8 +1323,8 @@ msgstr "コミット" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "手元の作業コピーの変更点をリポジトリに渡し、リポジトリのリビジョンを新しく作成するのに使用する Subversion コマンドです。" +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "手元の作業コピーの変更点をリポジトリに渡し、リポジトリのリビジョンを新しく作成するのに使用する Git コマンドです。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1451 @@ -1333,8 +1333,8 @@ msgstr "競合" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "リポジトリの変更が手元にマージされる際、時には同じ行に変更がある場合があります。この場合、Subversion はそちらを使用するか自動的に決定できません。これを競合と呼びます。それ以降の変更をコミットする前には、ファイルを手で修正し競合を解消しなければなりません。" +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "リポジトリの変更が手元にマージされる際、時には同じ行に変更がある場合があります。この場合、Git はそちらを使用するか自動的に決定できません。これを競合と呼びます。それ以降の変更をコミットする前には、ファイルを手で修正し競合を解消しなければなりません。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1463 @@ -1343,8 +1343,8 @@ msgstr "コピー" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "Subversion リポジトリでは、単一ファイルやツリー全体のコピーを作成できます。これは、領域を消費しないように、オリジナルへのリンクに少し似ている チープコピー で実装されています。コピーの作成ではコピー内に履歴を保存します。そのためコピーされる前についても追跡できます。" +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "Git リポジトリでは、単一ファイルやツリー全体のコピーを作成できます。これは、領域を消費しないように、オリジナルへのリンクに少し似ている チープコピー で実装されています。コピーの作成ではコピー内に履歴を保存します。そのためコピーされる前についても追跡できます。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1475 @@ -1383,8 +1383,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "リポジトリ用の Subversion が持つファイルシステムバックエンド。ネットワーク共有が可能。1.2 以降のリポジトリのデフォルト。" +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "リポジトリ用の Git が持つファイルシステムバックエンド。ネットワーク共有が可能。1.2 以降のリポジトリのデフォルト。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1515 @@ -1413,7 +1413,7 @@ msgstr "インポート" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "ひとつのリビジョンで、フォルダ階層のエントリをリポジトリにインポートするコマンドです。" #. (glossterm) @@ -1468,8 +1468,8 @@ msgstr "パッチ" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "作業コピーにテキストファイルの変更のみある場合、Unified Diff 形式で変更内容の単一ファイルを作成するのに、Subversion の Diff コマンドを使用できます。この形のファイルは、よく パッチ と言われており、他の誰か (やメーリングリスト) にメールで送ったり、他の作業コピーに適用したりできます。コミットアクセスできない人は、権限のあるコミッタが適用するように、変更をパッチファイルにして送ることができます。また、変更に自信がなければ、他の人に見てもらうようにパッチを送れます。" +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "作業コピーにテキストファイルの変更のみある場合、Unified Diff 形式で変更内容の単一ファイルを作成するのに、Git の Diff コマンドを使用できます。この形のファイルは、よく パッチ と言われており、他の誰か (やメーリングリスト) にメールで送ったり、他の作業コピーに適用したりできます。コミットアクセスできない人は、権限のあるコミッタが適用するように、変更をパッチファイルにして送ることができます。また、変更に自信がなければ、他の人に見てもらうようにパッチを送れます。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1599 @@ -1478,8 +1478,8 @@ msgstr "プロパティ" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "ディレクトリやファイルをバージョン管理下に置くのに加えて、Subversion はバージョン管理下のメタデータを追加できます。これは、バージョン管理下のディレクトリ・ファイルごとの プロパティ として参照されます。プロパティには、レジストリキーと同じように、それぞれ名前と値があります。Subversion には、svn:eol-style のような内部で使用する特殊なプロパティがいくつかあります。TortoiseGit にも tsvn:logminsize のような特殊なプロパティがあります。お好みの名前と値を持つプロパティの追加もできます。" +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "ディレクトリやファイルをバージョン管理下に置くのに加えて、Git はバージョン管理下のメタデータを追加できます。これは、バージョン管理下のディレクトリ・ファイルごとの プロパティ として参照されます。プロパティには、レジストリキーと同じように、それぞれ名前と値があります。Git には、svn:eol-style のような内部で使用する特殊なプロパティがいくつかあります。TortoiseGit にも tsvn:logminsize のような特殊なプロパティがあります。お好みの名前と値を持つプロパティの追加もできます。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1614 @@ -1523,8 +1523,8 @@ msgstr "取り消し" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "作業コピーを最後に更新したときから、Subversion はそれぞれのファイルの 当初の コピーを手元に保持しています。変更を行い、その変更を取り消したい場合は、取り消し コマンドを使用して当初のコピーに戻せます。" +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "作業コピーを最後に更新したときから、Git はそれぞれのファイルの 当初の コピーを手元に保持しています。変更を行い、その変更を取り消したい場合は、取り消し コマンドを使用して当初のコピーに戻せます。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1665 @@ -1558,13 +1558,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Subversion のよく使われる省略表現。" +msgid "A frequently-used abbreviation for Git." +msgstr "Git のよく使われる省略表現。" #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "svnserve リポジトリサーバで使われる、Subversion カスタムプロトコルの名前です。" +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "svnserve リポジトリサーバで使われる、Git カスタムプロトコルの名前です。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1707 @@ -1583,7 +1583,7 @@ msgstr "更新" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "リポジトリから作業コピーへ最新の変更点を取得するコマンド。作業コピーの変更点に、他の人が行った変更をマージします。" #. (glossterm) diff --git a/doc/po/TortoiseMerge_nl.po b/doc/po/TortoiseMerge_nl.po index ca3856f..c39945c 100644 --- a/doc/po/TortoiseMerge_nl.po +++ b/doc/po/TortoiseMerge_nl.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2006-10-11 21:52GMT Daylight Time\n" "PO-Revision-Date: 2008-09-15 21:57+0200\n" "Last-Translator: Bob Hulst \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -215,7 +215,7 @@ msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:198 #, fuzzy -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." msgstr " TortoiseMerge." #. (para) @@ -239,7 +239,7 @@ msgstr "TortoiseMerge." #. (para) #: ../source/TortoiseMerge_en.xml:220 #, fuzzy -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." msgstr "TortoiseMerge TortoiseMerge." #. (title) @@ -264,8 +264,8 @@ msgstr "We doorbrachten veel tijd op het internet op zoek naar een GUI tool die #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "Omdat TortoiseGit al gebruik maakt van de Subversion library, met ingebouwde diffing engine, was het heel natuurlijk om deze te gebruiken in plaats van de GNU diff." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "Omdat TortoiseGit al gebruik maakt van de Git library, met ingebouwde diffing engine, was het heel natuurlijk om deze te gebruiken in plaats van de GNU diff." #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -279,7 +279,7 @@ msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." msgstr "" #. (para) @@ -353,7 +353,7 @@ msgstr "Toepassen van Patches" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." msgstr "" #. (para) @@ -456,7 +456,7 @@ msgstr "After TortoiseMerge parses the patch file it will show you a small windo #. (para) #: ../source/TortoiseMerge_en.xml:493 #, fuzzy -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." msgstr "TortoiseMerge." #. (para) @@ -660,7 +660,7 @@ msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." msgstr "" #. (para) @@ -714,7 +714,7 @@ msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" msgstr "" #. (title) @@ -759,7 +759,7 @@ msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." msgstr "" #. (para) @@ -1263,7 +1263,7 @@ msgstr "Toevoegen" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "" #. (glossterm) @@ -1303,7 +1303,7 @@ msgstr "Tak" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "" #. (glossterm) @@ -1313,7 +1313,7 @@ msgstr "Checkout" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "" #. (glossterm) @@ -1323,7 +1323,7 @@ msgstr "Opschonen" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "" #. (glossterm) @@ -1333,7 +1333,7 @@ msgstr "Vastleggen" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "" #. (glossterm) @@ -1343,7 +1343,7 @@ msgstr "Validatie-conflict" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "" #. (glossterm) @@ -1353,7 +1353,7 @@ msgstr "Kopie" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "" #. (glossterm) @@ -1394,7 +1394,7 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 #, fuzzy -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "Berkeley DB. Een uitvoerig getest database backend, die niet kan worden gebruikt op netwerk shares. De default database backend voor pre 1.2 repositories." #. (glossterm) @@ -1424,7 +1424,7 @@ msgstr "Importeer" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "" #. (glossterm) @@ -1479,7 +1479,7 @@ msgstr "Patch" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "" #. (glossterm) @@ -1489,7 +1489,7 @@ msgstr "Eigenschap" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "" #. (glossterm) @@ -1535,7 +1535,7 @@ msgstr "Maak ongedaan" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "" #. (glossterm) @@ -1570,12 +1570,12 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Een vaak gebruikte afkorting voor Subversion." +msgid "A frequently-used abbreviation for Git." +msgstr "Een vaak gebruikte afkorting voor Git." #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "" #. (glossterm) @@ -1595,7 +1595,7 @@ msgstr "Bijwerken" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "" #. (glossterm) diff --git a/doc/po/TortoiseMerge_ru.po b/doc/po/TortoiseMerge_ru.po index 7ae0ce8..e874375 100644 --- a/doc/po/TortoiseMerge_ru.po +++ b/doc/po/TortoiseMerge_ru.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2008-11-17 17:19+0300\n" "Last-Translator: Stanislav Petrakov \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -217,8 +217,8 @@ msgstr "В процессе работы над текстовыми файла #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "Если вы работаете с системой управления версиями (например, Subversion), тогда вы иногда получаете конфликты при обновлении вашей рабочей копии. Это происходит, если кто-либо другой произвёл изменения в тех же частях файла, над которыми работали и вы в это время. Тогда вы должны уладить эти конфликты вручную,- и в этой ситуации TortoiseMerge может оказать помощь." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "Если вы работаете с системой управления версиями (например, Git), тогда вы иногда получаете конфликты при обновлении вашей рабочей копии. Это происходит, если кто-либо другой произвёл изменения в тех же частях файла, над которыми работали и вы в это время. Тогда вы должны уладить эти конфликты вручную,- и в этой ситуации TortoiseMerge может оказать помощь." #. (para) #: ../source/TortoiseMerge_en.xml:206 @@ -239,8 +239,8 @@ msgstr "Конфликт также может произойти, когда в #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "Но теперь, с TortoiseMerge, всё это не нужно - по крайней мере, если вы работаете с системой управления версиями, подобной Subversion. TortoiseMerge анализирует, для какой ревизии/версии был создан файл заплатки, и самостоятельно пытается извлечь эту версию из вашей системы управления версиями. Затем применяет заплатку и даёт возможность просмотреть оба набора изменений - ваш и автора заплатки. После этого вы можете решить, чьи изменения вы желаете оставить." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "Но теперь, с TortoiseMerge, всё это не нужно - по крайней мере, если вы работаете с системой управления версиями, подобной Git. TortoiseMerge анализирует, для какой ревизии/версии был создан файл заплатки, и самостоятельно пытается извлечь эту версию из вашей системы управления версиями. Затем применяет заплатку и даёт возможность просмотреть оба набора изменений - ваш и автора заплатки. После этого вы можете решить, чьи изменения вы желаете оставить." #. (title) #: ../source/TortoiseMerge_en.xml:235 @@ -264,8 +264,8 @@ msgstr "Итак, мы потратили много времени на пои #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "Поскольку TortoiseGit уже использует библиотеку Subversion, которая обладает хорошим механизмом сравнения, было вполне естественно использовать эту библиотеку вместо GNU diff." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "Поскольку TortoiseGit уже использует библиотеку Git, которая обладает хорошим механизмом сравнения, было вполне естественно использовать эту библиотеку вместо GNU diff." #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -279,8 +279,8 @@ msgstr "Просмотр различий между двумя файлами #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." -msgstr "Редактирование конфликтов между локальными изменениями и изменениями из хранилища Subversion после обновления." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." +msgstr "Редактирование конфликтов между локальными изменениями и изменениями из хранилища Git после обновления." #. (para) #: ../source/TortoiseMerge_en.xml:294 @@ -353,8 +353,8 @@ msgstr "Применение заплаток" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." -msgstr "Файл заплатки - это файл объединённых различий Subversion, содержащий информацию, необходимую для применения изменений к набору файлов. Заплатка может быть предоставлена другим разработчиком, чтобы вы могли посмотреть сделанные им изменения и, возможно, зафиксировать их в хранилище. Или, она может быть создана внутри TortoiseGit при сравнении двух папок. Это случается при сравнении ревизии из хранилища с рабочей папкой, или при сравнении двух различных путей в хранилище." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgstr "Файл заплатки - это файл объединённых различий Git, содержащий информацию, необходимую для применения изменений к набору файлов. Заплатка может быть предоставлена другим разработчиком, чтобы вы могли посмотреть сделанные им изменения и, возможно, зафиксировать их в хранилище. Или, она может быть создана внутри TortoiseGit при сравнении двух папок. Это случается при сравнении ревизии из хранилища с рабочей папкой, или при сравнении двух различных путей в хранилище." #. (para) #: ../source/TortoiseMerge_en.xml:380 @@ -455,8 +455,8 @@ msgstr "После того, как TortoiseMerge проанализирует #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "Но не беспокойтесь: если вы работаете с Subversion, вы можете извлечь старую версию файла и уладить конфликт. Фактически, TortoiseMerge самостоятельно пытается получить эту старую версию файла и затем показывает вам различия между базой (старая версия файла), моим (файл, каков он сейчас в вашей рабочей копии) и их файлом (старая версия файла, к которой применена заплатка). После этого вы можете уладить возможные конфликты вручную." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "Но не беспокойтесь: если вы работаете с Git, вы можете извлечь старую версию файла и уладить конфликт. Фактически, TortoiseMerge самостоятельно пытается получить эту старую версию файла и затем показывает вам различия между базой (старая версия файла), моим (файл, каков он сейчас в вашей рабочей копии) и их файлом (старая версия файла, к которой применена заплатка). После этого вы можете уладить возможные конфликты вручную." #. (para) #: ../source/TortoiseMerge_en.xml:504 @@ -655,8 +655,8 @@ msgstr "При работе в трёхпанельном режиме (иног #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." -msgstr "Иногда может быть так, что в Subversion файл помечен как конфликтующий, но при просмотре его при помощи TortoiseMerge никаких конфликтов не показывается. Это может быть из-за выбранного метода обработки пробельных символов: если вы выбрали игнорирование изменений завершений строк или пробельных символов, то строки будут помечены значком Конфликт-игнорируемое. Для улаживания конфликта вам всё равно придётся выбрать, какой из вариантов вы желаете использовать." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgstr "Иногда может быть так, что в Git файл помечен как конфликтующий, но при просмотре его при помощи TortoiseMerge никаких конфликтов не показывается. Это может быть из-за выбранного метода обработки пробельных символов: если вы выбрали игнорирование изменений завершений строк или пробельных символов, то строки будут помечены значком Конфликт-игнорируемое. Для улаживания конфликта вам всё равно придётся выбрать, какой из вариантов вы желаете использовать." #. (para) #: ../source/TortoiseMerge_en.xml:804 @@ -706,8 +706,8 @@ msgstr "Если вы желаете применить заплатку, вы #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" -msgstr "На данный момент поддерживаются только заплатки в формате объединённых различий (Unified Diff Format). И только файлы, созданные из рабочей копии Subversion; другие форматы, такие как заплатки, созданные CVS, сейчас не поддерживаются!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" +msgstr "На данный момент поддерживаются только заплатки в формате объединённых различий (Unified Diff Format). И только файлы, созданные из рабочей копии Git; другие форматы, такие как заплатки, созданные CVS, сейчас не поддерживаются!" #. (title) #: ../source/TortoiseMerge_en.xml:884 @@ -751,8 +751,8 @@ msgstr "Помечать цветом изменения внутри #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "Сравнивать непечатаемые знаки показывает все изменения в отступах и пробельных символах внутри строк как добавленные/удалённые строки (именно так Subversion обходиться с такого рода изменениями)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "Сравнивать непечатаемые знаки показывает все изменения в отступах и пробельных символах внутри строк как добавленные/удалённые строки (именно так Git обходиться с такого рода изменениями)." #. (para) #: ../source/TortoiseMerge_en.xml:924 @@ -1258,8 +1258,8 @@ msgstr "Добавить" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Команда Subversion, которая используется для добавления файла или папки в вашу рабочую копию. Эти новые элементы будут добавлены в хранилище при фиксации." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Команда Git, которая используется для добавления файла или папки в вашу рабочую копию. Эти новые элементы будут добавлены в хранилище при фиксации." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1368 @@ -1298,8 +1298,8 @@ msgstr "Ответвление" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Термин, часто используемый в системах управления версиями для описания ситуации, когда разработка разветвляется в определённой точке и следует по двум различным путям. Можно создать ответвление из основной линии разработки - для реализации новой возможности без приведения главной линии в нестабильное состояние, или можно ответвить стабильную версию, в которой делаются только исправления ошибок, в то время как новые разработки ведутся в нестабильном стволе. В Subversion ответвления реализованы как лёгкие копии." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Термин, часто используемый в системах управления версиями для описания ситуации, когда разработка разветвляется в определённой точке и следует по двум различным путям. Можно создать ответвление из основной линии разработки - для реализации новой возможности без приведения главной линии в нестабильное состояние, или можно ответвить стабильную версию, в которой делаются только исправления ошибок, в то время как новые разработки ведутся в нестабильном стволе. В Git ответвления реализованы как лёгкие копии." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 @@ -1308,8 +1308,8 @@ msgstr "Извлечение" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Команда Subversion, создающая локальную рабочую копию в пустой папке путём загрузки версированных файлов из хранилища." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Команда Git, создающая локальную рабочую копию в пустой папке путём загрузки версированных файлов из хранилища." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1424 @@ -1318,8 +1318,8 @@ msgstr "Очистка" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Цитата из Книги о Subversion: Рекурсивно очищает рабочую копию, удаляя блокировки и возобновляя незаконченные действия. Если вы когда-либо столкнётесь с ошибкой рабочая копия заблокирована, то запустите эту команду для удаления подвисших блокировок и приведения вашей рабочей копии в работоспособное состояние. Заметьте, что в этом контексте блокировка относится к блокированию в локальной файловой системе, а не в хранилище." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Цитата из Книги о Git: Рекурсивно очищает рабочую копию, удаляя блокировки и возобновляя незаконченные действия. Если вы когда-либо столкнётесь с ошибкой рабочая копия заблокирована, то запустите эту команду для удаления подвисших блокировок и приведения вашей рабочей копии в работоспособное состояние. Заметьте, что в этом контексте блокировка относится к блокированию в локальной файловой системе, а не в хранилище." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1441 @@ -1328,8 +1328,8 @@ msgstr "Фиксация" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Эта команда Subversion используется для передачи изменений из вашей рабочей копии обратно в хранилище, при этом создавая в нём новую ревизию." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Эта команда Git используется для передачи изменений из вашей рабочей копии обратно в хранилище, при этом создавая в нём новую ревизию." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1451 @@ -1338,8 +1338,8 @@ msgstr "Конфликт" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Когда изменения из хранилища сливаются с локальными, иногда случается, что они затрагивают одни и те же строки. В этом случае Subversion не может самостоятельно решить, какую из версий использовать и файл считается находящимся в конфликтном состоянии. Вы должны вручную отредактировать файл и уладить конфликты перед тем, как вы сможете зафиксировать любые дальнейшие изменения." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Когда изменения из хранилища сливаются с локальными, иногда случается, что они затрагивают одни и те же строки. В этом случае Git не может самостоятельно решить, какую из версий использовать и файл считается находящимся в конфликтном состоянии. Вы должны вручную отредактировать файл и уладить конфликты перед тем, как вы сможете зафиксировать любые дальнейшие изменения." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1463 @@ -1348,8 +1348,8 @@ msgstr "Копирование" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "В хранилище Subversion вы можете создать копию одного файла или целого дерева. Это реализовано через лёгкие копии, которые ведут себя подобно ссылке на оригинал: они почти не занимают места. Создание копии сохраняет историю элемента в копии, так что вы можете отследить изменения, сделанные до создания копии." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "В хранилище Git вы можете создать копию одного файла или целого дерева. Это реализовано через лёгкие копии, которые ведут себя подобно ссылке на оригинал: они почти не занимают места. Создание копии сохраняет историю элемента в копии, так что вы можете отследить изменения, сделанные до создания копии." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1475 @@ -1388,8 +1388,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Собственная внутренняя файловая система Subversion для хранилищ. Может быть использована на сетевых разделяемых ресурсах. Используется по умолчанию для хранилищ, начиная с версии 1.2." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Собственная внутренняя файловая система Git для хранилищ. Может быть использована на сетевых разделяемых ресурсах. Используется по умолчанию для хранилищ, начиная с версии 1.2." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1515 @@ -1418,8 +1418,8 @@ msgstr "Импорт" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Команда Subversion для импорта в хранилище целой иерархии папок за одну ревизию." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Команда Git для импорта в хранилище целой иерархии папок за одну ревизию." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1540 @@ -1473,8 +1473,8 @@ msgstr "Заплатка" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Если рабочая копия содержит изменения только в текстовых файлах, можно воспользоваться командой 'Различия' Subversion для генерации одного сводного файла, содержащего все эти изменения в формате объединённых различий. Файлы этого типа часто называются Заплатками, и они могут быть отправлены по электропочте кому-либо ещё (или в список рассылки) и применены к другой рабочей копии. Кто-нибудь без возможности фиксировать изменения может подготовить изменения и отправить файл заплатки для применения лицу, обладающему правом фиксации. Или, если нет уверенности в изменении, можно отправить заплатку другим для рецензирования." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Если рабочая копия содержит изменения только в текстовых файлах, можно воспользоваться командой 'Различия' Git для генерации одного сводного файла, содержащего все эти изменения в формате объединённых различий. Файлы этого типа часто называются Заплатками, и они могут быть отправлены по электропочте кому-либо ещё (или в список рассылки) и применены к другой рабочей копии. Кто-нибудь без возможности фиксировать изменения может подготовить изменения и отправить файл заплатки для применения лицу, обладающему правом фиксации. Или, если нет уверенности в изменении, можно отправить заплатку другим для рецензирования." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1599 @@ -1483,8 +1483,8 @@ msgstr "Свойство" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Помимо версирования ваших папок и файлов, Subversion позволяет добавлять версированные метаданные, - называемые свойствами, - к каждому версированному файлу или папке. У каждого свойства есть имя и значение, почти как у ключа реестра. В Subversion есть несколько специальных свойств для внутреннего использования, таких как svn:eol-style. И у TortoiseGit тоже есть такого рода свойства, вроде tsvn:logminsize. Вы можете добавить ваши собственные свойства с именем и значением по вашему выбору." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Помимо версирования ваших папок и файлов, Git позволяет добавлять версированные метаданные, - называемые свойствами, - к каждому версированному файлу или папке. У каждого свойства есть имя и значение, почти как у ключа реестра. В Git есть несколько специальных свойств для внутреннего использования, таких как svn:eol-style. И у TortoiseGit тоже есть такого рода свойства, вроде tsvn:logminsize. Вы можете добавить ваши собственные свойства с именем и значением по вашему выбору." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1614 @@ -1528,8 +1528,8 @@ msgstr "Убирание изменений (возврат)" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion локально сохраняет нетронутую копию каждого файла, каким этот файл был при последнем обновлении рабочей копии. Если вы сделали какие-то изменения и решили их откатить, вы можете использовать команду Убрать изменения для того, чтобы вернуться к нетронутой копии." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git локально сохраняет нетронутую копию каждого файла, каким этот файл был при последнем обновлении рабочей копии. Если вы сделали какие-то изменения и решили их откатить, вы можете использовать команду Убрать изменения для того, чтобы вернуться к нетронутой копии." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1665 @@ -1563,13 +1563,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Часто используемое сокращение для Subversion." +msgid "A frequently-used abbreviation for Git." +msgstr "Часто используемое сокращение для Git." #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Имя собственного протокола Subversion, используемого сервером хранилища svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Имя собственного протокола Git, используемого сервером хранилища svnserve." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1707 @@ -1588,8 +1588,8 @@ msgstr "Обновление" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Эта команда Subversion вносит последние изменения из хранилища в вашу рабочую копию, сливая все сделанные другими изменения с локальными изменениями из рабочей копии." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Эта команда Git вносит последние изменения из хранилища в вашу рабочую копию, сливая все сделанные другими изменения с локальными изменениями из рабочей копии." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1731 diff --git a/doc/po/TortoiseMerge_sk.po b/doc/po/TortoiseMerge_sk.po index 49039ee..0146d26 100644 --- a/doc/po/TortoiseMerge_sk.po +++ b/doc/po/TortoiseMerge_sk.po @@ -24,7 +24,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2008-12-17 21:57+0100\n" "Last-Translator: Oto BREZINA \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -221,8 +221,8 @@ msgstr "Pri práci s textovími súbormi, ako sú súbory zdrojových kódov rô #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "Keďi prácujete so správou verzií (napr. Subversion) občas sa pri aktualizovaní vašej pracovnej kópie dostanete do konfliktu. Toto sa stane keď niekto iný zmení rovnakú časť súboru, na ktorom ste pracovali, ako vy. Potom musíte tieto konflikty vyriešiť ručne. TortoiseMerge vám s tím môže pomôcť." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "Keďi prácujete so správou verzií (napr. Git) občas sa pri aktualizovaní vašej pracovnej kópie dostanete do konfliktu. Toto sa stane keď niekto iný zmení rovnakú časť súboru, na ktorom ste pracovali, ako vy. Potom musíte tieto konflikty vyriešiť ručne. TortoiseMerge vám s tím môže pomôcť." #. (para) #: ../source/TortoiseMerge_en.xml:206 @@ -243,8 +243,8 @@ msgstr "Konflikt môže vzniknúť aj pri pokuse použiť zastaralú záplatu. V #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "Ale s TortoiseMerge to už nie je nutné - alebo aspoň keď, pracujete so správou verzií ako je Subversion. TortoiseMerge analyzuje revízie/verzie súborov y ktorých bola záplata vztvorená a automaticky sa pokúša získať príslušnú verziu z vašej správy verzií. Potom použije záplatu a poskztne vám možnosť prezrieť si vaše aj ich zmeny v súbore. Potom môžete rozhodnúť, ktoré zmeny chcete zachovať." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "Ale s TortoiseMerge to už nie je nutné - alebo aspoň keď, pracujete so správou verzií ako je Git. TortoiseMerge analyzuje revízie/verzie súborov y ktorých bola záplata vztvorená a automaticky sa pokúša získať príslušnú verziu z vašej správy verzií. Potom použije záplatu a poskztne vám možnosť prezrieť si vaše aj ich zmeny v súbore. Potom môžete rozhodnúť, ktoré zmeny chcete zachovať." #. (title) #: ../source/TortoiseMerge_en.xml:235 @@ -268,8 +268,8 @@ msgstr "Tak sme strávili veľa času hladaním na internete grafického nástro #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "Kedže TortoiseGit už používa Subversion knižnicu, ktorá má zabudovaný pekný porovnávací engine, bolo len prirodzené použiť túto knižnicu namiesto GNU porovnávania (GNU diff)." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "Kedže TortoiseGit už používa Git knižnicu, ktorá má zabudovaný pekný porovnávací engine, bolo len prirodzené použiť túto knižnicu namiesto GNU porovnávania (GNU diff)." #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -283,7 +283,7 @@ msgstr "Prezeranie rozdielov medzi dvomi súbormi a spájanie zmien do jedného #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." msgstr "Úprava komfliktov medzi miestnymi zmenami a zmenami v úložisku Sibversion po aktualizácií." #. (para) @@ -359,8 +359,8 @@ msgstr "Používanie záplat" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." -msgstr "Záplatový súbor je súbor unifikovaného porovnania Subversion, ktorý obsahuje informácie potrebné na použite zmien do súborov. Záplata mohla byť dodaná iným vývojarom, takže si môžete prezrieť zmeny, ktoré vykonal a prípadne ich odovzdať do úložiska. Mohla tiež byť vytvorená v TortoiseGit pri porovnaní dvoch adresárovs. Toto sa stane, keď porovnáte úložisko s vašou pracovnou kópiou, alebo porovnáte dve rôzne revizie úložka, prípadne keď porovnáte dve cesty v úložisku." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgstr "Záplatový súbor je súbor unifikovaného porovnania Git, ktorý obsahuje informácie potrebné na použite zmien do súborov. Záplata mohla byť dodaná iným vývojarom, takže si môžete prezrieť zmeny, ktoré vykonal a prípadne ich odovzdať do úložiska. Mohla tiež byť vytvorená v TortoiseGit pri porovnaní dvoch adresárovs. Toto sa stane, keď porovnáte úložisko s vašou pracovnou kópiou, alebo porovnáte dve rôzne revizie úložka, prípadne keď porovnáte dve cesty v úložisku." #. (para) #: ../source/TortoiseMerge_en.xml:380 @@ -468,8 +468,8 @@ msgstr "Keď sa podarilo TortoiseMerge zanalyzovať záplatový súbor, zobrazí # Patch Filelist #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "Ale netreba sa obávať. Keď pracujete so Subversion môžete získať staršiu verziu súboru a konflikt vyriešiť. Fakticky, TortoiseMerge skúša automaticky získať takú staršiu verziu súboru a zobraziť vám rozdiely medzi Základ (staršia verzia súboru), Moje (súbor v jeho súčasnej podobe vo vašej pracovnej kópií) a Ich (staršia veriza súboru s použitou záplatou). Potom môžete ručne vyriešiť prípadné konflikty." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "Ale netreba sa obávať. Keď pracujete so Git môžete získať staršiu verziu súboru a konflikt vyriešiť. Fakticky, TortoiseMerge skúša automaticky získať takú staršiu verziu súboru a zobraziť vám rozdiely medzi Základ (staršia verzia súboru), Moje (súbor v jeho súčasnej podobe vo vašej pracovnej kópií) a Ich (staršia veriza súboru s použitou záplatou). Potom môžete ručne vyriešiť prípadné konflikty." # Patch Filelist #. (para) @@ -676,7 +676,7 @@ msgstr "Keď ste v trojpanelovom zobrazení (niekdy nazývanom pohľad #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." msgstr "Niekedy je súbor označený ako konfliktný, ale keď ho otvoríte v TortoiseMerge niesú tam zobrazené žiadne konflikty. Toto môže byť spôsobené spôsobom spracovania bielych znakov, ktoré ste si vybrali. Ak si vyberiete ignorovanie zmien koncov riadkov, alebo bielich znakov, tieto riadky budú označené použitím ikonky Conflict-Ignored. Na vyriešenie konfliktu je stále potrebné vybrať, ktorá verzia má byť použitá." # Merging / Editing Conflicts @@ -733,8 +733,8 @@ msgstr "Keď chcete použiť záplatový súbor musíte zadať cestu k záplatov # Applying Patches #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" -msgstr "Momantálne, sú podporované iba záplatové súbory vo formáte Unified Diff Format. A iba súbory, ktoré boli vytvorené z pracovnej kópie vo Subversion. Iné formáty ako napríklad záplatové súbory vytvorené CVS nie sú momentálne podporované!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" +msgstr "Momantálne, sú podporované iba záplatové súbory vo formáte Unified Diff Format. A iba súbory, ktoré boli vytvorené z pracovnej kópie vo Git. Iné formáty ako napríklad záplatové súbory vytvorené CVS nie sú momentálne podporované!" #. (title) #: ../source/TortoiseMerge_en.xml:884 @@ -779,8 +779,8 @@ msgstr "Farebné zobrazenie zmien v riadku používa rovnak #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "Porovnávať biele znaky zobrazí všetky zmeny v odsadení a zmeny bielych znakov vrámci riadkov, ako pridané/vymazané (, čo je spôsob, ako Subversion spracováva takéto zmeny)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "Porovnávať biele znaky zobrazí všetky zmeny v odsadení a zmeny bielych znakov vrámci riadkov, ako pridané/vymazané (, čo je spôsob, ako Git spracováva takéto zmeny)." #. (para) #: ../source/TortoiseMerge_en.xml:924 @@ -1299,8 +1299,8 @@ msgstr "Pridať" # add #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Príkaz Subversion, ktorý sa používa na pridanie súboru, alebo adresára do pracovnej kópie. Nové objekty budú pridané do úložiska pri odovzdaní." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Príkaz Git, ktorý sa používa na pridanie súboru, alebo adresára do pracovnej kópie. Nové objekty budú pridané do úložiska pri odovzdaní." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1368 @@ -1343,8 +1343,8 @@ msgstr "Vetva" # Branch #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Výraz sa často používa pri správe verzií na popísanie čo sa stene keď sa v niektorom bode vývoj rozdelí na dve samostatné cesty. Môžete vytvoriť vetvu hlavnej vývojovej línie, takže vývoj novej funkcie bez toho aby ste spravili hlavnú líniu nestabilnú. Alebo môžete vetviť stabilné vydania, v ktorých budete robiť len opravy chýb, kým vyvoj sa bude diať v nestabinlnom kmeni. Vo Subversion je vetvenie implementované ako lácná kópia." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Výraz sa často používa pri správe verzií na popísanie čo sa stene keď sa v niektorom bode vývoj rozdelí na dve samostatné cesty. Môžete vytvoriť vetvu hlavnej vývojovej línie, takže vývoj novej funkcie bez toho aby ste spravili hlavnú líniu nestabilnú. Alebo môžete vetviť stabilné vydania, v ktorých budete robiť len opravy chýb, kým vyvoj sa bude diať v nestabinlnom kmeni. Vo Git je vetvenie implementované ako lácná kópia." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 @@ -1354,7 +1354,7 @@ msgstr "Skontrolovať" # Checkout #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "Príkaz Suversion, ktorý vytvorí miestnu pracovnú kópiu v prázdnom adresáry stiahnutím verziovaných súborov z úložiska." #. (glossterm) @@ -1365,8 +1365,8 @@ msgstr "Vyčistiť" # CleanUp #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Citát z knihy pre subversion: Rekurzívne čistenie preacovnej kópie, odstráni zamknutie z obnoví nedokončené operácie. Ak sa vám objaví chyba Pracovná kópia je zamknutá, spustite tento príkaz, aby ste odstránili zámky a dostali ste opäť stabilnú pracovnú kópiu. Poznámka: V tomto kontexte sa pod slovom zámok myslí zámok miestného súborového systému, nie zámok úložiska." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Citát z knihy pre Git: Rekurzívne čistenie preacovnej kópie, odstráni zamknutie z obnoví nedokončené operácie. Ak sa vám objaví chyba Pracovná kópia je zamknutá, spustite tento príkaz, aby ste odstránili zámky a dostali ste opäť stabilnú pracovnú kópiu. Poznámka: V tomto kontexte sa pod slovom zámok myslí zámok miestného súborového systému, nie zámok úložiska." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1441 @@ -1376,8 +1376,8 @@ msgstr "Odovzdať" # Commit #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Príkaz Subversion, ktorý posunie zmeny vašej miestnej pracovnej kópie späť do úložiska, vytvoriac novú revíziu." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Príkaz Git, ktorý posunie zmeny vašej miestnej pracovnej kópie späť do úložiska, vytvoriac novú revíziu." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1451 @@ -1387,8 +1387,8 @@ msgstr "Konflikt" # Conflict #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Keď zmeny z úložiska sú zlučované s miestnymi zmenamy, niekedy sa tieto zmeny nachádzajú na tom istom riadku. V takomto prípade Subversion nemôže automaticky rozhodnúť, ktorú verziu má použiť a tak sa súbor dostane do stavu konfliktu. Musíte ručne upraviť súbor a vyriešiť konflikt pred tím ako odovzdáte svoje zmeny." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Keď zmeny z úložiska sú zlučované s miestnymi zmenamy, niekedy sa tieto zmeny nachádzajú na tom istom riadku. V takomto prípade Git nemôže automaticky rozhodnúť, ktorú verziu má použiť a tak sa súbor dostane do stavu konfliktu. Musíte ručne upraviť súbor a vyriešiť konflikt pred tím ako odovzdáte svoje zmeny." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1463 @@ -1398,8 +1398,8 @@ msgstr "Kopírovať" # Copy #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "V úložisku Subversion môžete vytvoriť kópiu jedného súboru, alebo celej adresárovej vetvy. Tieto sú implementované ako lacné kópie, ktoré sa správo trochu ako odkaz na pôvodný súbor, takže nezaberajú veľa miesta. Vytváranie kópií zachováva históriu jednotlivých kopírovaných objetov, takže môžete sledovať zmeny, ktoré boli vykonané pred vytvorením kópie." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "V úložisku Git môžete vytvoriť kópiu jedného súboru, alebo celej adresárovej vetvy. Tieto sú implementované ako lacné kópie, ktoré sa správo trochu ako odkaz na pôvodný súbor, takže nezaberajú veľa miesta. Vytváranie kópií zachováva históriu jednotlivých kopírovaných objetov, takže môžete sledovať zmeny, ktoré boli vykonané pred vytvorením kópie." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1475 @@ -1442,8 +1442,8 @@ msgstr "FSFS" # fsfs #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Vlastný súborový systém Subversion pre úložiská. Môže byť použitý i na zdielom disku. Predvolený u verzie 1.2 a novších." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Vlastný súborový systém Git pre úložiská. Môže byť použitý i na zdielom disku. Predvolený u verzie 1.2 a novších." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1515 @@ -1475,8 +1475,8 @@ msgstr "Importovať" # Import #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Príkaz Subversion k načítaniu celej adresárovej štruktúry do úložiska v jednej revízií." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Príkaz Git k načítaniu celej adresárovej štruktúry do úložiska v jednej revízií." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1540 @@ -1536,8 +1536,8 @@ msgstr "Záplata" # Patch #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Keď boli na pracovnej kópií zmené len textové súbory, je možné použiť príkaz Subversion porovnať, týmto je možné vytvoriť jednosúborový prehľad zmien v unifikovanom porovnaní. Súbor tohoto typu je označovaný ako Záplata a môže byť poslaná niekomu inému (alebo do postového zonznamu - mailinglist) a použitá na inej pracovnej kópií. Niekto bez práv na odovzdanie zmien takto môže urobyť zmeny a poslať ich vývojarovy, ktorý takéto práva má. Takisto, keď si nie ste istý zmenami, ktoré ste vykonali, môžete poslať záplatu na skontrolovanie." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Keď boli na pracovnej kópií zmené len textové súbory, je možné použiť príkaz Git porovnať, týmto je možné vytvoriť jednosúborový prehľad zmien v unifikovanom porovnaní. Súbor tohoto typu je označovaný ako Záplata a môže byť poslaná niekomu inému (alebo do postového zonznamu - mailinglist) a použitá na inej pracovnej kópií. Niekto bez práv na odovzdanie zmien takto môže urobyť zmeny a poslať ich vývojarovy, ktorý takéto práva má. Takisto, keď si nie ste istý zmenami, ktoré ste vykonali, môžete poslať záplatu na skontrolovanie." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1599 @@ -1547,8 +1547,8 @@ msgstr "Vlastnosť" # Property #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Okrem verziovania, Subversion umožňuje pridať aj verziované metadata - označované ako vlastnosti - ku každému verziovanému súboru a adresáru. Každá vlastnosť má meno a hodnotu, podobne ako kľúče windows registry. Subversion ma niekoľko špeciálnych vlastností pre vnútorné použite, ako je svn:eol-style. TortoiseGit má nietoré tiež, ako je tsvn:logminsize. Možete pridávať vlastné vlastnosti s menom a hodnotou podľa vašej vôle." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Okrem verziovania, Git umožňuje pridať aj verziované metadata - označované ako vlastnosti - ku každému verziovanému súboru a adresáru. Každá vlastnosť má meno a hodnotu, podobne ako kľúče windows registry. Git ma niekoľko špeciálnych vlastností pre vnútorné použite, ako je svn:eol-style. TortoiseGit má nietoré tiež, ako je tsvn:logminsize. Možete pridávať vlastné vlastnosti s menom a hodnotou podľa vašej vôle." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1614 @@ -1597,8 +1597,8 @@ msgstr "Vrátiť" # Revert #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion udržuje kópiu pôvodnej verzie každého súboru, tak ako bol pri poslednej aktualizácií pracovnej kópie. Ak ste urobili zmeny a rozhodli ste sa ich vrátiť, môžete použiť príkaz vrátiť na vrátenie sa k pôvodnej verzií." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git udržuje kópiu pôvodnej verzie každého súboru, tak ako bol pri poslednej aktualizácií pracovnej kópie. Ak ste urobili zmeny a rozhodli ste sa ich vrátiť, môžete použiť príkaz vrátiť na vrátenie sa k pôvodnej verzií." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1665 @@ -1635,13 +1635,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Často použivaná skratka pre Subversion" +msgid "A frequently-used abbreviation for Git." +msgstr "Často použivaná skratka pre Git" #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Meno protokolu pre Subversion použitéuho v servery úložiska svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Meno protokolu pre Git použitéuho v servery úložiska svnserve." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1707 @@ -1662,8 +1662,8 @@ msgstr "Aktualizovať" # Update #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Tento príkaz Subversion stiahne posledné zmeny z úložiska do vašej pracovnej kópie, zlučovaním zmien od ostatných so zmenami vo vašej pracovnej kópií." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Tento príkaz Git stiahne posledné zmeny z úložiska do vašej pracovnej kópie, zlučovaním zmien od ostatných so zmenami vo vašej pracovnej kópií." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1731 diff --git a/doc/po/TortoiseMerge_sl.po b/doc/po/TortoiseMerge_sl.po index 732a1a2..bcfc26a 100644 --- a/doc/po/TortoiseMerge_sl.po +++ b/doc/po/TortoiseMerge_sl.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2008-07-11 23:46 +0000\n" "PO-Revision-Date: 2008-09-19 22:16+0100\n" "Last-Translator: Matjaz Cepon \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -212,8 +212,8 @@ msgstr "Pri delu z besedilnimi datotekami, n. pr. datotekami izvorne kode v pril #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "Če delate s sistemi za nadzor različic (n. pr. s sistemom Subversion), se včasih pri posodabljanju datotek pojavijo spori. To se zgodi, če nek drug uporabnik spremeni isti del datoteke kot vi. V takšnem primeru morate ročno rešiti spore. Tu vam pomaga TortoiseMerge." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "Če delate s sistemi za nadzor različic (n. pr. s sistemom Git), se včasih pri posodabljanju datotek pojavijo spori. To se zgodi, če nek drug uporabnik spremeni isti del datoteke kot vi. V takšnem primeru morate ročno rešiti spore. Tu vam pomaga TortoiseMerge." #. (para) #: ../source/TortoiseMerge_en.xml:206 @@ -234,8 +234,8 @@ msgstr "Spor se lahko pojavi tudi, če poskusite popravek namestiti na zastarelo #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "S programom TortoiseMerge vam tega ni potrebno več početi - vsaj v primeru uporabe sistema Subversion ne. TortoiseMerge razčleni datoteko popravkov za revizijo/verzijo, za katero je bil popravek ustvarjen in poskuša samodejno pridobiti določeno revizijo datoteke iz sistema za nadzor različic. Potem popravek namesti in vam omogoči pregled sprememb, ki ste jih naredili vi in avtor programa. Lahko se odločite, katere spremembe boste obdržali." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "S programom TortoiseMerge vam tega ni potrebno več početi - vsaj v primeru uporabe sistema Git ne. TortoiseMerge razčleni datoteko popravkov za revizijo/verzijo, za katero je bil popravek ustvarjen in poskuša samodejno pridobiti določeno revizijo datoteke iz sistema za nadzor različic. Potem popravek namesti in vam omogoči pregled sprememb, ki ste jih naredili vi in avtor programa. Lahko se odločite, katere spremembe boste obdržali." #. (title) #: ../source/TortoiseMerge_en.xml:235 @@ -259,8 +259,8 @@ msgstr "Veliko časa smo zapravili za iskanje ustreznega grafičnega orodja na i #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." -msgstr "Ker TortoiseGit že uporablja knjižnice sistema Subversion, ki imajo vgrajeno dobro orodje za razlikovanje, je bila odločitev za uporabo teh knjižnic namesto sistema GNU diff enostavna." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgstr "Ker TortoiseGit že uporablja knjižnice sistema Git, ki imajo vgrajeno dobro orodje za razlikovanje, je bila odločitev za uporabo teh knjižnic namesto sistema GNU diff enostavna." #. (title) #: ../source/TortoiseMerge_en.xml:276 @@ -274,8 +274,8 @@ msgstr "Pregledovanje sprememb med dvema datotekama in spajanje sprememb v eno o #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." -msgstr "Urejanje sporov med krajevnimi spremembami in spremembami v skladišču Subversion po posodobitvi." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." +msgstr "Urejanje sporov med krajevnimi spremembami in spremembami v skladišču Git po posodobitvi." #. (para) #: ../source/TortoiseMerge_en.xml:294 @@ -348,8 +348,8 @@ msgstr "Namestitev popravkov" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." -msgstr "Datoteka popravkov je datoteka poenotene razlike sistema Subversion, ki vsebuje informacije, potrebne za namestitev sprememb na množico datotek. Popravek je mogoče poslal drug razvijalec, da njegove spremembe pregledate in jih po možnosti objavite v skladišču. Ali pa ga je ustvaril program TortoiseGit sam pri primerjanju map. To se zgodi pri primerjanju revizije iz skladišča z vašo delovno kopijo, pri primerjanju dveh revizij v skladišču ali pri primerjanju dveh poti v skladišču." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgstr "Datoteka popravkov je datoteka poenotene razlike sistema Git, ki vsebuje informacije, potrebne za namestitev sprememb na množico datotek. Popravek je mogoče poslal drug razvijalec, da njegove spremembe pregledate in jih po možnosti objavite v skladišču. Ali pa ga je ustvaril program TortoiseGit sam pri primerjanju map. To se zgodi pri primerjanju revizije iz skladišča z vašo delovno kopijo, pri primerjanju dveh revizij v skladišču ali pri primerjanju dveh poti v skladišču." #. (para) #: ../source/TortoiseMerge_en.xml:380 @@ -450,8 +450,8 @@ msgstr "Ko TortoiseMerge razčleni datoteko popravkov, prikaže majhno pogovorno #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "Brez skrbi. Če delate s sistemom Subversion, lahko pridobite starejško različico datoteke in rešite spor. V bistvu poskusi TortoiseMerge samodejno pridobiti starejšo različico datoteke in vam prikazati razlike med osnovno (staro različico datoteke), vašo (datoteke, kakršna je trenutno v vaši delovni kopiji) in njihovo (starejšo različico datoteke z že nameščenim popravkom). Sedaj lahko možne spore rešite ročno." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "Brez skrbi. Če delate s sistemom Git, lahko pridobite starejško različico datoteke in rešite spor. V bistvu poskusi TortoiseMerge samodejno pridobiti starejšo različico datoteke in vam prikazati razlike med osnovno (staro različico datoteke), vašo (datoteke, kakršna je trenutno v vaši delovni kopiji) in njihovo (starejšo različico datoteke z že nameščenim popravkom). Sedaj lahko možne spore rešite ročno." #. (para) #: ../source/TortoiseMerge_en.xml:504 @@ -650,8 +650,8 @@ msgstr "Če se nahajate v tridelnem pogledu (včasih mu rečemo tudi p #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." -msgstr "Včasih Subversion označi kakšno datoteko kot sporno, ko pa jo pogledate s programom TortoiseMerge, ne vidite nobenega spora. Razlog je lahko v načinu prikaza presledkov in tabulatorjev. Če spremembe presledkov ali končnic vrstic prezrete, so takšne vrstice označene z ikono Spor prezrt. Za rešitev spora morate še vedno izbrati željeno verzijo vrstice." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgstr "Včasih Git označi kakšno datoteko kot sporno, ko pa jo pogledate s programom TortoiseMerge, ne vidite nobenega spora. Razlog je lahko v načinu prikaza presledkov in tabulatorjev. Če spremembe presledkov ali končnic vrstic prezrete, so takšne vrstice označene z ikono Spor prezrt. Za rešitev spora morate še vedno izbrati željeno verzijo vrstice." #. (para) #: ../source/TortoiseMerge_en.xml:804 @@ -700,8 +700,8 @@ msgstr "Če želite namestiti popravek, morate navesti pot popravka in pot mape, #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" -msgstr "Trenutno so podprte le datoteke popravkov oblike poenotene razlike (Unified Diff Format), ki jih je ustvarilo orodje Subversion. Druge oblike, kot naprimer datoteka popravkov, ki jo ustvari orodje CVS, niso podprte!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" +msgstr "Trenutno so podprte le datoteke popravkov oblike poenotene razlike (Unified Diff Format), ki jih je ustvarilo orodje Git. Druge oblike, kot naprimer datoteka popravkov, ki jo ustvari orodje CVS, niso podprte!" #. (title) #: ../source/TortoiseMerge_en.xml:884 @@ -745,8 +745,8 @@ msgstr "Obarvaj spremembe v vrstici uporablja isti način k #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "Primerjaj presledke prikaže vse spremembe zamikanja in presledkov kot dodane/odstranjene vrstice (tako takšne spremembe obravnava Subversion)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." +msgstr "Primerjaj presledke prikaže vse spremembe zamikanja in presledkov kot dodane/odstranjene vrstice (tako takšne spremembe obravnava Git)." #. (para) #: ../source/TortoiseMerge_en.xml:924 @@ -1252,8 +1252,8 @@ msgstr "Dodaj" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Ukaz sistema Subversion, ki se uporablja za dodajanje datoteke ali mapo v delovno kopijo. Novi elementi se v skladišče dodajo ob objavi." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Ukaz sistema Git, ki se uporablja za dodajanje datoteke ali mapo v delovno kopijo. Novi elementi se v skladišče dodajo ob objavi." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1368 @@ -1292,8 +1292,8 @@ msgstr "Veja" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Izraz, ki se pogosto uporablja v sistemih za nadzor različic, in opisuje dve različni poti razvoja, ki se razcepita v določeni točki. Vejo lahko ustvarite na glavni veji, da razvijate novo lastnost ločeno, ne da bi glavno vejo naredili nestabilno. Lahko pa naredite vejo stabilne izdaje, na kateri le popravljate napake, nadaljni razvoj aplikacije pa se izvaja na nestabilni glavni veji. V sistemu Subversion je veja narejena kot poceni kopija." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Izraz, ki se pogosto uporablja v sistemih za nadzor različic, in opisuje dve različni poti razvoja, ki se razcepita v določeni točki. Vejo lahko ustvarite na glavni veji, da razvijate novo lastnost ločeno, ne da bi glavno vejo naredili nestabilno. Lahko pa naredite vejo stabilne izdaje, na kateri le popravljate napake, nadaljni razvoj aplikacije pa se izvaja na nestabilni glavni veji. V sistemu Git je veja narejena kot poceni kopija." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 @@ -1302,8 +1302,8 @@ msgstr "Prevzemi" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Ukaz sistema Subversion, ki iz skladišča prenese elemente pod nadzorom in tako ustvari krajevno delovno kopijo v prazni mapi." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Ukaz sistema Git, ki iz skladišča prenese elemente pod nadzorom in tako ustvari krajevno delovno kopijo v prazni mapi." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1424 @@ -1312,8 +1312,8 @@ msgstr "Počisti" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Citat iz knjige The Subversion Book: Rekurzivno počisti delovno kopijo, tako da odstrani zaklepe in zaključi nedokončane operacije. Če se vam kdaj prikaže sporočilo delovna kopija zaklenjena, poženite ta ukaz, da ostranite zaklepe in naredite delovno kopijo spet uporabno. Upoštevajte, da v tem kontekstu zaklep pomeni zaklepanje datotečnega sistema in ne zaklepanje skladišča." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Citat iz knjige The Git Book: Rekurzivno počisti delovno kopijo, tako da odstrani zaklepe in zaključi nedokončane operacije. Če se vam kdaj prikaže sporočilo delovna kopija zaklenjena, poženite ta ukaz, da ostranite zaklepe in naredite delovno kopijo spet uporabno. Upoštevajte, da v tem kontekstu zaklep pomeni zaklepanje datotečnega sistema in ne zaklepanje skladišča." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1441 @@ -1322,7 +1322,7 @@ msgstr "Objavi" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "Ta ukaz omogoča prenos krajevnih sprememb v skladišče. S tem se v skladišču ustvari nova revizije." #. (glossterm) @@ -1332,8 +1332,8 @@ msgstr "Spor" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Ob spajanju sprememb iz skladišča s krajevnimi spremembami se včasih zgodi, da se spremembe zgodijo v isti vrstici. V takšnem primeru se Subversion ne more sam odločiti, katera različica vrstice je pravilna. Rečemo, da je datoteka sporna. Pred objavo morate spremembe morate ročno popraviti in tako rešiti spore." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Ob spajanju sprememb iz skladišča s krajevnimi spremembami se včasih zgodi, da se spremembe zgodijo v isti vrstici. V takšnem primeru se Git ne more sam odločiti, katera različica vrstice je pravilna. Rečemo, da je datoteka sporna. Pred objavo morate spremembe morate ročno popraviti in tako rešiti spore." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1463 @@ -1342,8 +1342,8 @@ msgstr "Kopiraj" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "V skladišču In Subversion lahko ustvarjate kopije posameznih datotek ali celotnih dreves. Te kopije so poceni kopije, ki delujejo kot povezava na izvirno datoteko ali mapo in ne zavzemajo skoraj nič prostora. Usvarjanje kopije ohrani zgodovino kopiranega elementa, tako da lahko pregledujete spremembe tudi pred izdelavo kopije." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "V skladišču In Git lahko ustvarjate kopije posameznih datotek ali celotnih dreves. Te kopije so poceni kopije, ki delujejo kot povezava na izvirno datoteko ali mapo in ne zavzemajo skoraj nič prostora. Usvarjanje kopije ohrani zgodovino kopiranega elementa, tako da lahko pregledujete spremembe tudi pred izdelavo kopije." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1475 @@ -1382,8 +1382,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Ekskluziven datotečni sistem za skladišča sistema Subversion. Uporablja se lahko tudi v omrežnih datotekah v skupni rabi. Privzet sistem pri različicah 1.2 in novejših." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Ekskluziven datotečni sistem za skladišča sistema Git. Uporablja se lahko tudi v omrežnih datotekah v skupni rabi. Privzet sistem pri različicah 1.2 in novejših." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1515 @@ -1412,8 +1412,8 @@ msgstr "Uvozi" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Ukaz sistema Subversion za uvoz celotne hierarhije map v skladišče v eni sami reviziji." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Ukaz sistema Git za uvoz celotne hierarhije map v skladišče v eni sami reviziji." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1540 @@ -1467,7 +1467,7 @@ msgstr "Popravek" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "Če so se v delovni kopiji spremenile le besedilne datoteke, je možno z ukazom Razlikuj ustvariti datoteko s povzetkom sprememb v obliki poenotene različice (unified diff). Datoteka takšnega tipa se pogosto imenuje popravek in se lahko uporablja za pošiljanje sprememb po elektronski pošti vašemu sodelavcu ali dopisnemu seznamu. Ta datoteka se potem uporabi na neki drugi delovni kopiji. Nekdo, ki nima pravice pisanja po skladišču, lahko naredi spremembe in ustvari popravek, ki ga objavi nek drug uporabnik, ki ustrezne pravice ima. Ali pa če niste prepričani, da so vaše spremembe dobre, lahko na ta način drugim uporabnikom pošljete spremembe v pregled." #. (glossterm) @@ -1477,8 +1477,8 @@ msgstr "Lastnost" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Poleg vodenja različic map in datotek Subversion omogoča tudi vodenje različic meta podatkov - rečemo jim lastnosti - za vsak element pod nadzorom. Vsaka lastnost ima ime in vrednost, podobno kot register. Subversion interno uporablja nekaj posebnih lastnosti, n. pr. svn:eol-style. Tudi TortoiseGit uporablja nekaj internih lastnosti, n. pr. tsvn:logminsize. Lahko pa dodate svoje lastnosti s poljubnim imenom in vrednostjo." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Poleg vodenja različic map in datotek Git omogoča tudi vodenje različic meta podatkov - rečemo jim lastnosti - za vsak element pod nadzorom. Vsaka lastnost ima ime in vrednost, podobno kot register. Git interno uporablja nekaj posebnih lastnosti, n. pr. svn:eol-style. Tudi TortoiseGit uporablja nekaj internih lastnosti, n. pr. tsvn:logminsize. Lahko pa dodate svoje lastnosti s poljubnim imenom in vrednostjo." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1614 @@ -1522,8 +1522,8 @@ msgstr "Povrni" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion hrani krajevno originalno kopijo vsake datoteke, kakršna je bila ob zadnji posodobitvi. Če ste na datoteki naredili spremembe in jih želite povrniti, uporabite ukaz povrni, da dobite nazaj originalno datoteko." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git hrani krajevno originalno kopijo vsake datoteke, kakršna je bila ob zadnji posodobitvi. Če ste na datoteki naredili spremembe in jih želite povrniti, uporabite ukaz povrni, da dobite nazaj originalno datoteko." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1665 @@ -1557,13 +1557,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Pogosto uporabljena okrajšava za Subversion" +msgid "A frequently-used abbreviation for Git." +msgstr "Pogosto uporabljena okrajšava za Git" #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Ime lastnega protokola sistema Subversion, ki ga uporablja strežnik skladišč svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Ime lastnega protokola sistema Git, ki ga uporablja strežnik skladišč svnserve." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1707 @@ -1582,8 +1582,8 @@ msgstr "Posodobitev" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Ta ukaz Subversion prenese iz skladišča v delovno kopijo zadnje spremembe, pri tem spremembe spoji s krajevnimi spremembami, narejenimi v delovni kopiji." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Ta ukaz Git prenese iz skladišča v delovno kopijo zadnje spremembe, pri tem spremembe spoji s krajevnimi spremembami, narejenimi v delovni kopiji." #. (glossterm) #: ../source/TortoiseMerge_en.xml:1731 diff --git a/doc/po/TortoiseMerge_sr_spc.po b/doc/po/TortoiseMerge_sr_spc.po index f4159db..bf16960 100644 --- a/doc/po/TortoiseMerge_sr_spc.po +++ b/doc/po/TortoiseMerge_sr_spc.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2008-11-17 23:13+0100\n" "Last-Translator: Milorad Popović\n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -214,7 +214,7 @@ msgstr "Док се ради са текст фајловима, тј. фајл #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." msgstr "Ако радите са системом контроле верзија (тј. Субверзија) тада понекад добијете конфликте када ажурирате вашу радну копију. Ово се дешава ако је још неко изменио исте делове фајла на коме сте ви тренутно радили. Тада имате да решите ове конфликте ручно. Ту вам ТортоисеМерге може помоћи." #. (para) @@ -236,7 +236,7 @@ msgstr " Конфликт се такође може јавити ако пок #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." msgstr "Али сада са ТортоисеМерге ово више није неопходно - ни најмање ако радите са системом контроле верзија као што је Субверзија. ТортоисеМерге анализира фајл закрпе за ревизија/верзија закрпе креиране и аутоматски покушава да нађе специјалну верзију из ваше сорс-контроле. Затим се примењује на закрпе и омогућава вам да прегледате обоје, ваше измене фајла и од других. Затим можете одлучити које измене желите да задржите." #. (title) @@ -261,7 +261,7 @@ msgstr "Тако смо потрошили пуно времена претра #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." msgstr "како ТортоисеСВН већ користи Субверзиону библиотеку, која има фино разликовање у себи, било је природно да се користи библиотека уместо ГНУ разл." #. (title) @@ -276,7 +276,7 @@ msgstr "Гледање разлике између два фајла и спај #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." msgstr "Уређење конфликата између локалних измена и измена у Субверзионом спремишту пратећи ажурирање." #. (para) @@ -350,7 +350,7 @@ msgstr "Примена закрпа" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." msgstr "Фајл закрпе је Субверзиони обједињени дифф фајл, који садржи информације које захтевају да се примене измене у скупу фајлова. Други људи из развоја су набављали закрпе тако да можете видети измене које су урађене можда урезати их у спремиште. Или може бити генерисан интерно помоћу ТортоисеСВН када се упореде два именика. Ово се дешава када се упореде ревизије спремишта са вашим имеником радне копије, или ако упоредите две разлике ревизија спремишта, или ако упоредите две различите путање спремишта." #. (para) @@ -452,7 +452,7 @@ msgstr "После анализе ТортоисеМерге фајла закр #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." msgstr "Али не брините. Ако радите са Субверзијом можете вратити стару верзију фајла и решити конфликт. У ствари, ТортоисеМерге аутоматски покушава да добије стару верзију фајла и онда вам показује дифф између Основе (стара верзија фајла), Мој (фајл као онај који је тренутно у вашој радној копији) и Њихови (стара верзија фајла са закрпом која је већ примењена). Тада можете решити могуће конфликте ручно." #. (para) @@ -652,7 +652,7 @@ msgstr "Ако сте у три панела погледу (понекад зв #. (para) #: ../source/TortoiseMerge_en.xml:796 -msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." msgstr "Понекад фајл ће бити означен као конфликтан у Субверзији, али када га погледате помоћу ТортоисеМерге неће бити приказаних конфликата. Ово се може десити због начина на који сте руковали белимпољимљ. Ако изаберете да занемарите линијски-завршетак ил белапоља измене, те линије ће бити означене коеистећи Конфликт-Занемарен икеоне. Да се реши конфликт треба само одабрати коју верзију да користите." #. (para) @@ -702,7 +702,7 @@ msgstr "Ако желите да примените фајл закрпу има #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" msgstr "Тренутно, само фајлови закрпе у mphasis>Уједињен Дифф Формат је подржан. И само фајлови који су генерисани из Субверзионе радне копије. Остали формати као фајлови закрпе генерисани са ЦВС тренутно нису подржани." #. (title) @@ -747,7 +747,7 @@ msgstr "Колор код у-линији измене ко #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." msgstr "Поређење белихпоља приказује све измене у увлачењу линија и унутарлинијска белапоља као додате/уклоњене линије (како Субверзија третира такве измене)." #. (para) @@ -1254,7 +1254,7 @@ msgstr "Додај" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "Субверзиона команда која се користи да дода фајл или именик у вашу радну копију. Нова ставка је додата у спремиште када урезујете." #. (glossterm) @@ -1294,7 +1294,7 @@ msgstr "Грана" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "Термин често коришћен у систему контроле верзија да опише шта се дешава када људи из развоја у посебном управе и следе 2 одвојене путање. Можете креирати грану линије главног развоја тако да развијете нове особине без да учините главну линију нестабилном. Или можете гранати стабилну реализацију где се фиксирали багове, док нови развој крене на нестабилном деблу. У Субверзији грана се инплементира као јефтина копија." #. (glossterm) @@ -1304,7 +1304,7 @@ msgstr "Преузимање" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "Субверзиона команда која креира локалну радну копију у празном именику скидањем верзионисаних фајлова из спремишта." #. (glossterm) @@ -1314,7 +1314,7 @@ msgstr "Чишћење" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "Да цитирамо из Субверзионе књиге: Рекурзивно бришите радну копију, избаците кључеве и поновите незавршене операције. Ако икад добијете радна копија закључавања грешка, урадите ову команду да избаците бајате кључеве и доведете радну копију у корисном стању. Приметимо да у овом контексту закључавање се односи на закључавање фајлсистема, није закључавање спремишта." #. (glossterm) @@ -1324,7 +1324,7 @@ msgstr "Урезивање" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "Субверзиона команда се користи да се прођу измене у вашој локалној радној копији назад у спремиште, креирањем нове ревизије спремишта." #. (glossterm) @@ -1334,7 +1334,7 @@ msgstr "Конфликт" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "Када се измене из спремишта споје са локалним изменама, понекад ове измене се појављују у истој линији. У том случају Субверзија не може аутоматски да одлучи коју верзију да користи и за фајл се каже да је у конфликту. Имате да уредите фајл ручно и решите конфликт пре него што урежете даље измене." #. (glossterm) @@ -1344,7 +1344,7 @@ msgstr "Копирање" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "У Субверзионом спремишту можете креирати копију појединог фајла или празно стабло. Ово је примењено као јефтине копије које помало личе на на везе ка оригиналима у томе да готово немају рамаке. Правећи копију сачува се историја ствке у копији тако да можете пратити измене пре него је копија направљена." #. (glossterm) @@ -1384,7 +1384,7 @@ msgstr "ФСФС" #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "Овлашћени Субверзиони фајлсистем у основи спремишта. Може се користити у мрежној подели. Уобичајен за 1.2 и новија спремишта." #. (glossterm) @@ -1414,7 +1414,7 @@ msgstr "Увоз" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "Субверзиона команда да увезе целу хијерархију именика у спремиште у једној ревизији." #. (glossterm) @@ -1469,7 +1469,7 @@ msgstr "Закрпа" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "Радна копија има измене само текст фајлова, могуће је користити Субверзионе Дифф команде да се генерише појединачан фајл резултата тих измена у Уједињеном Дифф формату. Фајл овог типа се често односи на Закрпу, и може послато епоштом још неком (или на поштанску листу) и применити се у следећој радној копији.Неко без приступа урезивању може урадити измене и послати фајл закрпу ауторизованом урезивачу да је примени. Или ако нисте сигурни у измене можете послати закрпу другима да је прегледају. " #. (glossterm) @@ -1479,7 +1479,7 @@ msgstr "Особина" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "У додатку верзионисању ваших именика и фајлова, Субверзија омогућава да додате верзионисане метаподатке - означених као особине сваког од верзионисаних именика и фајлова. Свака особина има име и вредност, радије као кључ регистра. Субверзија има неке специјалне особине које се користе интерно, тако као свн:еол-стил. ТортоисеСВН има неке такође, као тсвн:логминсајз. Можете додати ваше особине са било којим именом и вредношћу коју изаберете. " #. (glossterm) @@ -1524,7 +1524,7 @@ msgstr "Вратити" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "Субверзија чува локалну неизмењену копију сваког фајла какав је био када сте последњи пут ажурирали радну копију. Ако урадите измене и одлучите да их поништите треба да користите врати команду да се вратите на неизмењену копију." #. (glossterm) @@ -1559,12 +1559,12 @@ msgstr "СВН" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." +msgid "A frequently-used abbreviation for Git." msgstr "Често-коришћена скраћеница за Субверзију." #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "Име Субверзионог обичног протокола коришћеног од свнсерв сервера спремишта." #. (glossterm) @@ -1584,7 +1584,7 @@ msgstr "Ажурирање" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "Субверзиона команда довлачи задње измене из спремишта у вашу радну копију, спајајући било коју измену урађену од других са локалним изменама у радној копији." #. (glossterm) diff --git a/doc/po/TortoiseMerge_sr_spl.po b/doc/po/TortoiseMerge_sr_spl.po index ac56c19..6116daa 100644 --- a/doc/po/TortoiseMerge_sr_spl.po +++ b/doc/po/TortoiseMerge_sr_spl.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2008-11-17 23:16+0100\n" "Last-Translator: Milorad Popović\n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -214,7 +214,7 @@ msgstr "Dok se radi sa tekst fajlovima, tj. fajlovi izvornog koda u vašem najdr #. (para) #: ../source/TortoiseMerge_en.xml:198 -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgid "If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." msgstr "Ako radite sa sistemom kontrole verzija (tj. Subverzija) tada ponekad dobijete konflikte kada ažurirate vašu radnu kopiju. Ovo se dešava ako je još neko izmenio iste delove fajla na kome ste vi trenutno radili. Tada imate da rešite ove konflikte ručno. Tu vam TortoiseMerge može pomoći." #. (para) @@ -236,7 +236,7 @@ msgstr " Konflikt se takođe može javiti ako pokušate primeniti zastareli fajl #. (para) #: ../source/TortoiseMerge_en.xml:220 -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." msgstr "Ali sada sa TortoiseMerge ovo više nije neophodno - ni najmanje ako radite sa sistemom kontrole verzija kao što je Subverzija. TortoiseMerge analizira fajl zakrpe za revizija/verzija zakrpe kreirane i automatski pokušava da nađe specijalnu verziju iz vaše sors-kontrole. Zatim se primenjuje na zakrpe i omogućava vam da pregledate oboje, vaše izmene fajla i od drugih. Zatim možete odlučiti koje izmene želite da zadržite." #. (title) @@ -261,7 +261,7 @@ msgstr "Tako smo potrošili puno vremena pretražujući internet za GUI alat koj #. (para) #: ../source/TortoiseMerge_en.xml:268 -msgid "Since TortoiseGit already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." +msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." msgstr "kako TortoiseGit već koristi Subverzionu biblioteku, koja ima fino razlikovanje u sebi, bilo je prirodno da se koristi biblioteka umesto GNU razl." #. (title) @@ -276,7 +276,7 @@ msgstr "Gledanje razlike između dva fajla i spajanje izmena u jedan od njih, il #. (para) #: ../source/TortoiseMerge_en.xml:288 -msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." +msgid "Editing conflicts between local changes and changes in the Git repository following an update." msgstr "Uređenje konflikata između lokalnih izmena i izmena u Subverzionom spremištu prateći ažuriranje." #. (para) @@ -350,7 +350,7 @@ msgstr "Primena zakrpa" #. (para) #: ../source/TortoiseMerge_en.xml:370 -msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." +msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths." msgstr "Fajl zakrpe je Subverzioni objedinjeni diff fajl, koji sadrži informacije koje zahtevaju da se primene izmene u skupu fajlova. Drugi ljudi iz razvoja su nabavljali zakrpe tako da možete videti izmene koje su urađene možda urezati ih u spremište. Ili može biti generisan interno pomoću TortoiseGit kada se uporede dva imenika. Ovo se dešava kada se uporede revizije spremišta sa vašim imenikom radne kopije, ili ako uporedite dve razlike revizija spremišta, ili ako uporedite dve različite putanje spremišta." #. (para) @@ -452,7 +452,7 @@ msgstr "Posle analize TortoiseMerge fajla zakrpa biće pokazano mali prozor sa s #. (para) #: ../source/TortoiseMerge_en.xml:493 -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." msgstr "Ali ne brinite. Ako radite sa Subverzijom možete vratiti staru verziju fajla i rešiti konflikt. U stvari, TortoiseMerge automatski pokušava da dobije staru verziju fajla i onda vam pokazuje diff između Osnove (stara verzija fajla), Moj (fajl kao onaj koji je trenutno u vašoj radnoj kopiji) i NJihovi (stara verzija fajla sa zakrpom koja je već primenjena). Tada možete rešiti moguće konflikte ručno." #. (para) @@ -652,7 +652,7 @@ msgstr "Ako ste u tri panela pogledu (ponekad zvan pogled spajanjaConflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." +msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." msgstr "Ponekad fajl će biti označen kao konfliktan u Subverziji, ali kada ga pogledate pomoću TortoiseMerge neće biti prikazanih konflikata. Ovo se može desiti zbog načina na koji ste rukovali belimpoljimlj. Ako izaberete da zanemarite linijski-završetak il belapolja izmene, te linije će biti označene koeisteći Konflikt-Zanemaren ikeone. Da se reši konflikt treba samo odabrati koju verziju da koristite." #. (para) @@ -702,7 +702,7 @@ msgstr "Ako želite da primenite fajl zakrpu imate da podesite obe putanje do sa #. (para) #: ../source/TortoiseMerge_en.xml:873 -msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" +msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!" msgstr "Trenutno, samo fajlovi zakrpe u mphasis>Ujedinjen Diff Format je podržan. I samo fajlovi koji su generisani iz Subverzione radne kopije. Ostali formati kao fajlovi zakrpe generisani sa CVS trenutno nisu podržani." #. (title) @@ -747,7 +747,7 @@ msgstr "Kolor kod u-liniji izmene koristi istu šemu kao i #. (para) #: ../source/TortoiseMerge_en.xml:919 -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)." msgstr "Poređenje belihpolja prikazuje sve izmene u uvlačenju linija i unutarlinijska belapolja kao dodate/uklonjene linije (kako Subverzija tretira takve izmene)." #. (para) @@ -1254,7 +1254,7 @@ msgstr "Dodaj" #. (para) #: ../source/TortoiseMerge_en.xml:1360 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "Subverziona komanda koja se koristi da doda fajl ili imenik u vašu radnu kopiju. Nova stavka je dodata u spremište kada urezujete." #. (glossterm) @@ -1294,7 +1294,7 @@ msgstr "Grana" #. (para) #: ../source/TortoiseMerge_en.xml:1402 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "Termin često korišćen u sistemu kontrole verzija da opiše šta se dešava kada ljudi iz razvoja u posebnom uprave i slede 2 odvojene putanje. Možete kreirati granu linije glavnog razvoja tako da razvijete nove osobine bez da učinite glavnu liniju nestabilnom. Ili možete granati stabilnu realizaciju gde se fiksirali bagove, dok novi razvoj krene na nestabilnom deblu. U Subverziji grana se inplementira kao jeftina kopija." #. (glossterm) @@ -1304,7 +1304,7 @@ msgstr "Preuzimanje" #. (para) #: ../source/TortoiseMerge_en.xml:1417 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "Subverziona komanda koja kreira lokalnu radnu kopiju u praznom imeniku skidanjem verzionisanih fajlova iz spremišta." #. (glossterm) @@ -1314,7 +1314,7 @@ msgstr "Čišćenje" #. (para) #: ../source/TortoiseMerge_en.xml:1426 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "Da citiramo iz Subverzione knjige: Rekurzivno brišite radnu kopiju, izbacite ključeve i ponovite nezavršene operacije. Ako ikad dobijete radna kopija zaključavanja greška, uradite ovu komandu da izbacite bajate ključeve i dovedete radnu kopiju u korisnom stanju. Primetimo da u ovom kontekstu zaključavanje se odnosi na zaključavanje fajlsistema, nije zaključavanje spremišta." #. (glossterm) @@ -1324,7 +1324,7 @@ msgstr "Urezivanje" #. (para) #: ../source/TortoiseMerge_en.xml:1443 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "Subverziona komanda se koristi da se prođu izmene u vašoj lokalnoj radnoj kopiji nazad u spremište, kreiranjem nove revizije spremišta." #. (glossterm) @@ -1334,7 +1334,7 @@ msgstr "Konflikt" #. (para) #: ../source/TortoiseMerge_en.xml:1453 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "Kada se izmene iz spremišta spoje sa lokalnim izmenama, ponekad ove izmene se pojavljuju u istoj liniji. U tom slučaju Subverzija ne može automatski da odluči koju verziju da koristi i za fajl se kaže da je u konfliktu. Imate da uredite fajl ručno i rešite konflikt pre nego što urežete dalje izmene." #. (glossterm) @@ -1344,7 +1344,7 @@ msgstr "Kopiranje" #. (para) #: ../source/TortoiseMerge_en.xml:1465 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "U Subverzionom spremištu možete kreirati kopiju pojedinog fajla ili prazno stablo. Ovo je primenjeno kao jeftine kopije koje pomalo liče na na veze ka originalima u tome da gotovo nemaju ramake. Praveći kopiju sačuva se istorija stvke u kopiji tako da možete pratiti izmene pre nego je kopija napravljena." #. (glossterm) @@ -1384,7 +1384,7 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "Ovlašćeni Subverzioni fajlsistem u osnovi spremišta. Može se koristiti u mrežnoj podeli. Uobičajen za 1.2 i novija spremišta." #. (glossterm) @@ -1414,7 +1414,7 @@ msgstr "Uvoz" #. (para) #: ../source/TortoiseMerge_en.xml:1533 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "Subverziona komanda da uveze celu hijerarhiju imenika u spremište u jednoj reviziji." #. (glossterm) @@ -1469,7 +1469,7 @@ msgstr "Zakrpa" #. (para) #: ../source/TortoiseMerge_en.xml:1586 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "Radna kopija ima izmene samo tekst fajlova, moguće je koristiti Subverzione Diff komande da se generiše pojedinačan fajl rezultata tih izmena u Ujedinjenom Diff formatu. Fajl ovog tipa se često odnosi na Zakrpu, i može poslato epoštom još nekom (ili na poštansku listu) i primeniti se u sledećoj radnoj kopiji.Neko bez pristupa urezivanju može uraditi izmene i poslati fajl zakrpu autorizovanom urezivaču da je primeni. Ili ako niste sigurni u izmene možete poslati zakrpu drugima da je pregledaju. " #. (glossterm) @@ -1479,7 +1479,7 @@ msgstr "Osobina" #. (para) #: ../source/TortoiseMerge_en.xml:1601 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "U dodatku verzionisanju vaših imenika i fajlova, Subverzija omogućava da dodate verzionisane metapodatke - označenih kao osobine svakog od verzionisanih imenika i fajlova. Svaka osobina ima ime i vrednost, radije kao ključ registra. Subverzija ima neke specijalne osobine koje se koriste interno, tako kao svn:eol-stil. TortoiseGit ima neke takođe, kao tsvn:logminsajz. Možete dodati vaše osobine sa bilo kojim imenom i vrednošću koju izaberete. " #. (glossterm) @@ -1524,7 +1524,7 @@ msgstr "Vratiti" #. (para) #: ../source/TortoiseMerge_en.xml:1656 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "Subverzija čuva lokalnu neizmenjenu kopiju svakog fajla kakav je bio kada ste poslednji put ažurirali radnu kopiju. Ako uradite izmene i odlučite da ih poništite treba da koristite vrati komandu da se vratite na neizmenjenu kopiju." #. (glossterm) @@ -1559,12 +1559,12 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." +msgid "A frequently-used abbreviation for Git." msgstr "Često-korišćena skraćenica za Subverziju." #. (para) #: ../source/TortoiseMerge_en.xml:1700 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "Ime Subverzionog običnog protokola korišćenog od svnserv servera spremišta." #. (glossterm) @@ -1584,7 +1584,7 @@ msgstr "Ažuriranje" #. (para) #: ../source/TortoiseMerge_en.xml:1723 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "Subverziona komanda dovlači zadnje izmene iz spremišta u vašu radnu kopiju, spajajući bilo koju izmenu urađenu od drugih sa lokalnim izmenama u radnoj kopiji." #. (glossterm) diff --git a/doc/po/TortoiseMerge_zh_CN.po b/doc/po/TortoiseMerge_zh_CN.po index 521b9d3..a9d7ac3 100644 --- a/doc/po/TortoiseMerge_zh_CN.po +++ b/doc/po/TortoiseMerge_zh_CN.po @@ -35,7 +35,7 @@ # repository 版本库 # revert 恢复 # revision 版本 -# Subversion book Subversion 手册 +# Git book Git 手册 # undo 撤销 # unified diff 标准差异 # unversioned 未版本控制 @@ -48,7 +48,7 @@ msgstr "" "POT-Creation-Date: 2008-11-17 00:14 +0000\n" "PO-Revision-Date: 2008-12-24 09:36+0800\n" "Last-Translator: Dongsheng Song \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -324,13 +324,13 @@ msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:198 msgid "" -"If you're working with a version control system (e.g. Subversion) then you " +"If you're working with a version control system (e.g. Git) then you " "sometimes get conflicts when you update your working " "copy. This happens if someone else changed the same parts of the file you're " "currently working on as you did. Then you have to resolve those conflicts " "manually. This is where TortoiseMerge can help you." msgstr "" -"如果你使用版本控制系统(如 Subversion)时，当你更新工作副本时你可能会遇到“ " +"如果你使用版本控制系统(如 Git)时，当你更新工作副本时你可能会遇到“ " "冲突 ”。这种情况通常发生在其他人也修改了你当前正在处理的" "文件的同一部分。当遇到冲突时，你必须手工来解决它——这就是 TortoiseMerge 能帮助" "你的地方。" @@ -363,13 +363,13 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:220 msgid "" "But now with TortoiseMerge this isn't necessary anymore - at least not if " -"you're working with a version control system like Subversion. TortoiseMerge " +"you're working with a version control system like Git. TortoiseMerge " "parses the patch file for the revision/version the patch was created for and " "automatically tries to fetch that specific version from your source-control. " "Then it applies the patch and lets you review both your changes to the file, " "and theirs. Then you can decide which changes you want to keep." msgstr "" -"但是现在有了 TortoiseMerge，它就不再是必需的了 —— 至少当你使用类似 Subversion " +"但是现在有了 TortoiseMerge，它就不再是必需的了 —— 至少当你使用类似 Git " "这样的版本控制系统时不是必需的。TortoiseMerge 解析补丁文件创建的修订版/版本" "号，并自动尝试从你的版本控制系统中获取对应的版本。然后应用该补丁，让你对比文件" "的原始内容及其修改后的内容。因此你能决定是否接受那些修改。" @@ -424,11 +424,11 @@ msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:268 msgid "" -"Since TortoiseGit already uses the Subversion library, which has a nice " +"Since TortoiseGit already uses the Git library, which has a nice " "diffing engine built in, it was just natural to use this library instead of " "the GNU diff." msgstr "" -"因为 TortoiseGit 已经使用了 Subversion 库，它内置了一个很好的差异比较工具。很" +"因为 TortoiseGit 已经使用了 Git 库，它内置了一个很好的差异比较工具。很" "自然的，我们使用这个库代替 GNU diff。" #. (title) @@ -451,7 +451,7 @@ msgstr "察看两个文件的差异，合并它们，或者删除不想要的修 #. (para) #: ../source/TortoiseMerge_en.xml:288 msgid "" -"Editing conflicts between local changes and changes in the Subversion " +"Editing conflicts between local changes and changes in the Git " "repository following an update." msgstr "更新后，编辑本地修改和版本库修改之间的冲突。" @@ -570,7 +570,7 @@ msgstr "应用补丁" #. (para) #: ../source/TortoiseMerge_en.xml:370 msgid "" -"A patch file is a Subversion unified diff file, which contains the " +"A patch file is a Git unified diff file, which contains the " "information required to apply changes to a set of files. The patch may have " "been supplied by another developer so that you can see changes he has made " "and possibly commit them to the repository. Or it may have been generated " @@ -579,7 +579,7 @@ msgid "" "compare two different repository revisions, or if you compare two different " "repository paths." msgstr "" -"补丁文件是 Subversion 统一差异格式，它包含了使用补丁的信息。补丁可能是其他人提" +"补丁文件是 Git 统一差异格式，它包含了使用补丁的信息。补丁可能是其他人提" "供的，所以你可以察看其修改，或许将它提交到版本库。或者补丁是 TortoiseGit 比较" "两个目录生成的。例如你比较版本库中的版本与工作副本，或者比较两个版本库版本，或" "者比较两个不同的版本库路径。" @@ -745,7 +745,7 @@ msgstr "补丁文件列表" #. (para) #: ../source/TortoiseMerge_en.xml:493 msgid "" -"But don't worry. If you're working with Subversion you can retrieve an older " +"But don't worry. If you're working with Git you can retrieve an older " "version of the file and resolve the conflict. In fact, TortoiseMerge " "automatically tries to get that older version of the file and then shows you " "the diff between Base (the older version of the file), " @@ -753,7 +753,7 @@ msgid "" "and Theirs (the older version of the file with the patch " "already applied). Then you can resolve possible conflicts manually." msgstr "" -"但是别担心。如果你使用 Subversion，可以取出这个文件的老版本来解决冲突。实际" +"但是别担心。如果你使用 Git，可以取出这个文件的老版本来解决冲突。实际" "上，TortoiseMerge 自动尝试取出老版本，给出基础版本(此文件" "的老版本), 我的版本(你的工作副本中的文件)，和他" "人的版本(已经打补丁的老版本)之间的差异。然后你可以手工解决冲突。" @@ -1154,14 +1154,14 @@ msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:796 msgid "" -"Sometimes a file will be marked as conflicted in Subversion, yet when you " +"Sometimes a file will be marked as conflicted in Git, yet when you " "view it using TortoiseMerge there are no conflicts shown. This may be due to " "the whitespace handling you have chosen. If you choose to ignore line-endings " "or whitespace changes, those lines will be marked using the " "Conflict-Ignored icon. To resolve the conflict you still " "need to pick which version you want to use." msgstr "" -"有时候在 Subversion 中的文件会被标记为冲突，但是当你用 TortoiseMerge 察看时，" +"有时候在 Git 中的文件会被标记为冲突，但是当你用 TortoiseMerge 察看时，" "却没有显示冲突。这可能是你选择的空白处理方式造成的。如果你选择忽略行结束符或空" "白改变，这些行会用 冲突被忽略 图标标记。为了解决冲突，你" "仍旧需要选择你要使用的版本。" @@ -1260,11 +1260,11 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:873 msgid "" "Currently, only patch files in Unified Diff Format are " -"supported. And only files which were generated from a Subversion working " +"supported. And only files which were generated from a Git working " "copy. Other formats like patch files generated by CVS are currently not " "supported!" msgstr "" -"当前仅支持标准差异格式。并且是在 Subversion 工作副本中生" +"当前仅支持标准差异格式。并且是在 Git 工作副本中生" "成的补丁。其它格式，例如 CVS 生成的补丁文件不受支持！" #. (title) @@ -1332,11 +1332,11 @@ msgstr "" #: ../source/TortoiseMerge_en.xml:919 msgid "" "Compare whitespaces shows all changes in indentation and " -"inline whitespace as added/removed lines (which is how Subversion treats such " +"inline whitespace as added/removed lines (which is how Git treats such " "changes)." msgstr "" "比较空白字符 将全部缩进变化，或行内空白字符的变化按照添" -"加/删除的行显示(即 Subversion 处理变化的方式)。" +"加/删除的行显示(即 Git 处理变化的方式)。" #. (para) #: ../source/TortoiseMerge_en.xml:924 @@ -1924,10 +1924,10 @@ msgstr "增加" #. (para) #: ../source/TortoiseMerge_en.xml:1360 msgid "" -"A Subversion command that is used to add a file or directory to your working " +"A Git command that is used to add a file or directory to your working " "copy. The new items are added to the repository when you commit." msgstr "" -"用于增加文件或目录到你的工作副本中的 Subversion 命令。当你提交时，这些新项目会" +"用于增加文件或目录到你的工作副本中的 Git 命令。当你提交时，这些新项目会" "增加到版本库中。" #. (glossterm) @@ -1991,13 +1991,13 @@ msgid "" "You can create a branch off the main development line so as to develop a new " "feature without rendering the main line unstable. Or you can branch a stable " "release to which you make only bug fixes, while new developments take place " -"on the unstable trunk. In Subversion a branch is implemented as a " +"on the unstable trunk. In Git a branch is implemented as a " "cheap copy." msgstr "" "一个经常被开发者在特定时期跟踪两个独立路径时使用的术语，它描述了在版本控制系统" "中发生的事情。你可以从主开发线创建分支，从而开发新特性，不会使主开发线陷入不稳" "定状态。或者你创建一个稳定发布版的分支，仅用于修复问题，新的开发位于不稳定的主" -"开发线。在 Subversion 中，分支用廉价拷贝实现。" +"开发线。在 Git 中，分支用廉价拷贝实现。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 @@ -2007,10 +2007,10 @@ msgstr "检出" #. (para) #: ../source/TortoiseMerge_en.xml:1417 msgid "" -"A Subversion command which creates a local working copy in an empty directory " +"A Git command which creates a local working copy in an empty directory " "by downloading versioned files from the repository." msgstr "" -"此 Subversion 命令从版本库下载受版本控制的文件，在空目录创建本地工作副本。" +"此 Git 命令从版本库下载受版本控制的文件，在空目录创建本地工作副本。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1424 @@ -2020,14 +2020,14 @@ msgstr "清理" #. (para) #: ../source/TortoiseMerge_en.xml:1426 msgid "" -"To quote from the Subversion book: Recursively clean up the working " +"To quote from the Git book: Recursively clean up the working " "copy, removing locks and resuming unfinished operations. If you ever get a " "working copy locked error, run this command to remove " "stale locks and get your working copy into a usable state again. " "Note that in this context lock refers to local " "filesystem locking, not repository locking." msgstr "" -"摘自 Subversion 手册： 递归的清理工作目录，删除锁，恢复未完成的工作。如" +"摘自 Git 手册： 递归的清理工作目录，删除锁，恢复未完成的工作。如" "果你遇到工作目录已经锁定错误，运行此命令删除过时的锁，使你" "的工作副本恢复到可用状态。注释：在此上下文中锁指的是本" "地文件系统中的锁，不是版本库的锁。" @@ -2040,9 +2040,9 @@ msgstr "提交" #. (para) #: ../source/TortoiseMerge_en.xml:1443 msgid "" -"This Subversion command is used to pass the changes in your local working " +"This Git command is used to pass the changes in your local working " "copy back into the repository, creating a new repository revision." -msgstr "此 Subversion 命令用于将你的本地修改传递到版本库中，创建新版本。" +msgstr "此 Git 命令用于将你的本地修改传递到版本库中，创建新版本。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1451 @@ -2053,12 +2053,12 @@ msgstr "冲突" #: ../source/TortoiseMerge_en.xml:1453 msgid "" "When changes from the repository are merged with local changes, sometimes " -"those changes occur on the same lines. In this case Subversion cannot " +"those changes occur on the same lines. In this case Git cannot " "automatically decide which version to use and the file is said to be in " "conflict. You have to edit the file manually and resolve the conflict before " "you can commit any further changes." msgstr "" -"当仓库的改变合并到本地修改时，有时会在相同的行修改。在这种情况下，Subversion " +"当仓库的改变合并到本地修改时，有时会在相同的行修改。在这种情况下，Git " "不能自动决定采用哪个版本，文件就处于冲突状态。你必须手工编辑文件，在你提交之前" "解决冲突。" @@ -2070,13 +2070,13 @@ msgstr "复制" #. (para) #: ../source/TortoiseMerge_en.xml:1465 msgid "" -"In a Subversion repository you can create a copy of a single file or an " +"In a Git repository you can create a copy of a single file or an " "entire tree. These are implemented as cheap copies which act a " "bit like a link to the original in that they take up almost no space. Making " "a copy preserves the history of the item in the copy, so you can trace " "changes made before the copy was made." msgstr "" -"在 Subversion 版本库中，你可以创建单个文件或一个目录树的副本。此操作用" +"在 Git 版本库中，你可以创建单个文件或一个目录树的副本。此操作用" "廉价拷贝实现，它有些象符号连接到原始文件，几乎不耗费空间。创建的副本保" "留了历史，所以你可以跟踪副本创建之前的修改。" @@ -2132,10 +2132,10 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseMerge_en.xml:1508 msgid "" -"A proprietary Subversion filesystem backend for repositories. Can be used on " +"A proprietary Git filesystem backend for repositories. Can be used on " "network shares. Default for 1.2 and newer repositories." msgstr "" -"一个专用于 Subversion 版本库的文件系统后端，可以使用网络文件系统(例如 NFS 或 " +"一个专用于 Git 版本库的文件系统后端，可以使用网络文件系统(例如 NFS 或 " "SMBFS)。是 1.2 版本及其后的版本库之默认后端。" #. (glossterm) @@ -2168,9 +2168,9 @@ msgstr "导入" #. (para) #: ../source/TortoiseMerge_en.xml:1533 msgid "" -"Subversion command to import an entire folder hierarchy into the repository " +"Git command to import an entire folder hierarchy into the repository " "in a single revision." -msgstr "用于一次导入整个文件夹(包含子目录)的 Subversion 命令。" +msgstr "用于一次导入整个文件夹(包含子目录)的 Git 命令。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1540 @@ -2244,14 +2244,14 @@ msgstr "补丁" #: ../source/TortoiseMerge_en.xml:1586 msgid "" "If a working copy has changes to text files only, it is possible to use " -"Subversion's Diff command to generate a single file summary of those changes " +"Git's Diff command to generate a single file summary of those changes " "in Unified Diff format. A file of this type is often referred to as a " "Patch, and it can be emailed to someone else (or to a mailing " "list) and applied to another working copy. Someone without commit access can " "make changes and submit a patch file for an authorized committer to apply. Or " "if you are unsure about a change you can submit a patch for others to review." msgstr "" -"如果工作副本只修改了文本文件，就可以使用 Subversion 的差异命令产生一个标准差异" +"如果工作副本只修改了文本文件，就可以使用 Git 的差异命令产生一个标准差异" "格式文件。这种文件类型通常称为补丁，可以应用到其他工作副本。没" "有提交权的人可以在修改后，发送补丁文件给一个认可的提交者来提交。或者不能确定此" "修改是否恰当，你可以发送补丁给其他人评审。" @@ -2264,17 +2264,17 @@ msgstr "属性" #. (para) #: ../source/TortoiseMerge_en.xml:1601 msgid "" -"In addition to versioning your directories and files, Subversion allows you " +"In addition to versioning your directories and files, Git allows you " "to add versioned metadata - referred to as properties to each " "of your versioned directories and files. Each property has a name and a " -"value, rather like a registry key. Subversion has some special properties " +"value, rather like a registry key. Git has some special properties " "which it uses internally, such as svn:eol-style. " "TortoiseGit has some too, such as tsvn:logminsize. You can " "add your own properties with any name and value you choose." msgstr "" -"在版本控制文件和目录之外，Subversion 还允许你增加版本控制元数据 - 称为" +"在版本控制文件和目录之外，Git 还允许你增加版本控制元数据 - 称为" "属性 - 到你的版本控制文件和目录。每个属性都有名字和值，很像注册表键。" -"Subversion 有内部使用的专用属性，例如 svn:eol-style。" +"Git 有内部使用的专用属性，例如 svn:eol-style。" "TortoiseGit 也是如此，例如 tsvn:logminsize。你可以增加自己" "的属性，允许选择任意名称和取值。" @@ -2347,12 +2347,12 @@ msgstr "恢复" #. (para) #: ../source/TortoiseMerge_en.xml:1656 msgid "" -"Subversion keeps a local pristine copy of each file as it was " +"Git keeps a local pristine copy of each file as it was " "when you last updated your working copy. If you have made changes and decide " "you want to undo them, you can use the revert command to go " "back to the pristine copy." msgstr "" -"当最后更新工作目录时，Subversion 为每个文件保留了一份本地原始副" +"当最后更新工作目录时，Git 为每个文件保留了一份本地原始副" "本。如果你做了修改，决定撤销，可以使用恢复命令得到原始副本。" #. (glossterm) @@ -2405,13 +2405,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseMerge_en.xml:1697 -msgid "A frequently-used abbreviation for Subversion." -msgstr "一个友好的 Subversion 缩写。" +msgid "A frequently-used abbreviation for Git." +msgstr "一个友好的 Git 缩写。" #. (para) #: ../source/TortoiseMerge_en.xml:1700 msgid "" -"The name of the Subversion custom protocol used by the svnservesvnserve repository server." msgstr "被svnserve版本库服务器使用的专用协议名称。" @@ -2443,11 +2443,11 @@ msgstr "更新" #. (para) #: ../source/TortoiseMerge_en.xml:1723 msgid "" -"This Subversion command pulls down the latest changes from the repository " +"This Git command pulls down the latest changes from the repository " "into your working copy, merging any changes made by others with local changes " "in the working copy." msgstr "" -"此命令从 Subversion 版本库下载最新的修改到你的工作副本，合并任何本地修改。" +"此命令从 Git 版本库下载最新的修改到你的工作副本，合并任何本地修改。" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1731 diff --git a/doc/po/TortoiseSVN.pot b/doc/po/TortoiseSVN.pot index fcde826..aa44377 100644 --- a/doc/po/TortoiseSVN.pot +++ b/doc/po/TortoiseSVN.pot @@ -25,7 +25,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5 #.(subtitle) -msgid "A Subversion client for Windows" +msgid "A Git client for Windows" msgstr "" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated @@ -106,7 +106,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:72 #.(para) -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." msgstr "" #: ../source/TortoiseGit_en.xml:84 @@ -126,17 +126,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:95 #.(para) -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." msgstr "" #: ../source/TortoiseGit_en.xml:102 #.(para) -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." msgstr "" #: ../source/TortoiseGit_en.xml:107 #.(para) -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." msgstr "" #: ../source/TortoiseGit_en.xml:113 @@ -161,7 +161,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:134 #.(para) -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." msgstr "" #: ../source/TortoiseGit_en.xml:144 @@ -186,7 +186,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:169 #.(para) -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." msgstr "" #: ../source/TortoiseGit_en.xml:180 @@ -236,12 +236,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:216 #.(term) -msgid "The Subversion Book" +msgid "The Git Book" msgstr "" #: ../source/TortoiseGit_en.xml:218 #.(para) -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" +msgid "for the great introduction to Git and its chapter 2 which we copied here" msgstr "" #: ../source/TortoiseGit_en.xml:225 @@ -355,12 +355,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:340 #.(para) -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." msgstr "" #: ../source/TortoiseGit_en.xml:352 #.(para) -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." msgstr "" #: ../source/TortoiseGit_en.xml:368 @@ -370,17 +370,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:369 #.(para) -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." msgstr "" #: ../source/TortoiseGit_en.xml:375 #.(para) -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." msgstr "" #: ../source/TortoiseGit_en.xml:386 #.(para) -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." msgstr "" #: ../source/TortoiseGit_en.xml:399 @@ -390,7 +390,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:400 #.(para) -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." msgstr "" #: ../source/TortoiseGit_en.xml:406 @@ -430,17 +430,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:445 #.(term) -msgid "Easy access to Subversion commands" +msgid "Easy access to Git commands" msgstr "" #: ../source/TortoiseGit_en.xml:447 #.(para) -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." msgstr "" #: ../source/TortoiseGit_en.xml:454 #.(para) -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" msgstr "" #: ../source/TortoiseGit_en.xml:460 @@ -450,7 +450,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:462 #.(para) -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." msgstr "" #: ../source/TortoiseGit_en.xml:475 @@ -480,7 +480,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:499 #.(para) -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." msgstr "" #: ../source/TortoiseGit_en.xml:516 @@ -490,7 +490,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:518 #.(para) -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." msgstr "" #: ../source/TortoiseGit_en.xml:529 @@ -500,7 +500,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:531 #.(para) -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." msgstr "" #: ../source/TortoiseGit_en.xml:542 @@ -510,7 +510,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:544 #.(para) -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." msgstr "" #: ../source/TortoiseGit_en.xml:558 @@ -655,22 +655,22 @@ msgstr "" #: ../source/TortoiseGit_en.xml:725 #.(primary) -msgid "Subversion book" +msgid "Git book" msgstr "" #: ../source/TortoiseGit_en.xml:727 #.(para) -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." msgstr "" #: ../source/TortoiseGit_en.xml:735 #.(para) -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." msgstr "" #: ../source/TortoiseGit_en.xml:743 #.(para) -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." msgstr "" #: ../source/TortoiseGit_en.xml:751 @@ -691,7 +691,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:755 #.(para) -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." msgstr "" #: ../source/TortoiseGit_en.xml:767 @@ -701,7 +701,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:770 #.(para) -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." msgstr "" #: ../source/TortoiseGit_en.xml:780 @@ -775,7 +775,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:895 #.(para) -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." msgstr "" #: ../source/TortoiseGit_en.xml:907 @@ -817,17 +817,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:976 #.(title) -msgid "What does Subversion Do?" +msgid "What does Git Do?" msgstr "" #: ../source/TortoiseGit_en.xml:977 #.(para) -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." msgstr "" #: ../source/TortoiseGit_en.xml:989 #.(title) -msgid "Subversion in Action" +msgid "Git in Action" msgstr "" #: ../source/TortoiseGit_en.xml:991 @@ -842,27 +842,27 @@ msgstr "" #: ../source/TortoiseGit_en.xml:995 #.(para) -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." msgstr "" #: ../source/TortoiseGit_en.xml:1000 #.(para) -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." msgstr "" #: ../source/TortoiseGit_en.xml:1010 #.(para) -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." msgstr "" #: ../source/TortoiseGit_en.xml:1020 #.(para) -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." msgstr "" #: ../source/TortoiseGit_en.xml:1031 #.(para) -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." msgstr "" #: ../source/TortoiseGit_en.xml:1038 @@ -887,12 +887,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1058 #.(para) -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." msgstr "" #: ../source/TortoiseGit_en.xml:1068 #.(para) -msgid "To publish your changes to others, you can use Subversion's commit command." +msgid "To publish your changes to others, you can use Git's commit command." msgstr "" #: ../source/TortoiseGit_en.xml:1072 @@ -902,17 +902,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1078 #.(para) -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." msgstr "" #: ../source/TortoiseGit_en.xml:1086 #.(para) -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." msgstr "" #: ../source/TortoiseGit_en.xml:1094 #.(para) -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." msgstr "" #: ../source/TortoiseGit_en.xml:1103 @@ -922,7 +922,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1104 #.(para) -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" msgstr "" #: ../source/TortoiseGit_en.xml:1112 @@ -959,7 +959,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1135 #.(entry) -msgid "Access via WebDAV protocol to Subversion-aware Apache server." +msgid "Access via WebDAV protocol to Git-aware Apache server." msgstr "" #: ../source/TortoiseGit_en.xml:1141 @@ -1005,7 +1005,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1168 #.(para) -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." msgstr "" #: ../source/TortoiseGit_en.xml:1181 @@ -1055,7 +1055,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1231 #.(para) -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." msgstr "" #: ../source/TortoiseGit_en.xml:1238 @@ -1075,7 +1075,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1261 #.(para) -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" msgstr "" #: ../source/TortoiseGit_en.xml:1276 @@ -1113,7 +1113,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1312 #.(para) -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." msgstr "" #: ../source/TortoiseGit_en.xml:1325 @@ -1123,7 +1123,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1326 #.(para) -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" msgstr "" #: ../source/TortoiseGit_en.xml:1332 @@ -1138,7 +1138,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1345 #.(para) -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" msgstr "" #: ../source/TortoiseGit_en.xml:1352 @@ -1178,7 +1178,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1395 #.(para) -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." msgstr "" #: ../source/TortoiseGit_en.xml:1412 @@ -1188,7 +1188,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1413 #.(para) -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" msgstr "" #: ../source/TortoiseGit_en.xml:1419 @@ -1198,12 +1198,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1425 #.(para) -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." msgstr "" #: ../source/TortoiseGit_en.xml:1432 #.(para) -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." msgstr "" #: ../source/TortoiseGit_en.xml:1445 @@ -1213,12 +1213,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1447 #.(para) -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." msgstr "" #: ../source/TortoiseGit_en.xml:1458 #.(para) -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." msgstr "" #: ../source/TortoiseGit_en.xml:1466 @@ -1243,7 +1243,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1486 #.(para) -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" msgstr "" #: ../source/TortoiseGit_en.xml:1492 @@ -1255,7 +1255,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1498 #.(para) -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." msgstr "" #: ../source/TortoiseGit_en.xml:1509 @@ -1265,7 +1265,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1511 #.(para) -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." msgstr "" #: ../source/TortoiseGit_en.xml:1521 @@ -1347,17 +1347,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1628 #.(title) -msgid "Installing Subversion" +msgid "Installing Git" msgstr "" #: ../source/TortoiseGit_en.xml:1632 #.(para) -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." msgstr "" #: ../source/TortoiseGit_en.xml:1644 #.(para) -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." msgstr "" #: ../source/TortoiseGit_en.xml:1654 @@ -1369,12 +1369,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1656 #.(para) -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." msgstr "" #: ../source/TortoiseGit_en.xml:1669 #.(para) -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." msgstr "" #: ../source/TortoiseGit_en.xml:1677 @@ -1396,7 +1396,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1713 #.(para) -msgid "At the end of the config file add the following lines: \n<Location /svn>\n DAV svn\n SVNListParentPath on\n SVNParentPath D:\\SVN\n #SVNIndexXSLT \"/svnindex.xsl\"\n AuthType Basic\n AuthName \"Subversion repositories\"\n AuthUserFile passwd\n #AuthzSVNAccessFile svnaccessfile\n Require valid-user\n</Location>\n This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +msgid "At the end of the config file add the following lines: \n<Location /svn>\n DAV svn\n SVNListParentPath on\n SVNParentPath D:\\SVN\n #SVNIndexXSLT \"/svnindex.xsl\"\n AuthType Basic\n AuthName \"Git repositories\"\n AuthUserFile passwd\n #AuthzSVNAccessFile svnaccessfile\n Require valid-user\n</Location>\n This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" #: ../source/TortoiseGit_en.xml:1740 @@ -1411,12 +1411,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1764 #.(para) -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." msgstr "" #: ../source/TortoiseGit_en.xml:1703 #.(para) -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " msgstr "" #: ../source/TortoiseGit_en.xml:1777 @@ -1455,17 +1455,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1798 #.(entry) -msgid "means that the Subversion repositories are available from the URL " +msgid "means that the Git repositories are available from the URL " msgstr "" #: ../source/TortoiseGit_en.xml:1805 #.(entry) -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." msgstr "" #: ../source/TortoiseGit_en.xml:1812 #.(entry) -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." msgstr "" #: ../source/TortoiseGit_en.xml:1822 @@ -1475,7 +1475,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1820 #.(entry) -msgid "tells Subversion to look for repositories below " +msgid "tells Git to look for repositories below " msgstr "" #: ../source/TortoiseGit_en.xml:1827 @@ -1500,7 +1500,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1854 #.(entry) -msgid "Location of the Access file for paths inside a Subversion repository" +msgid "Location of the Access file for paths inside a Git repository" msgstr "" #: ../source/TortoiseGit_en.xml:1861 @@ -1515,7 +1515,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1888 #.(para) -msgid "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n#AuthzSVNAccessFile svnaccessfile\n and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +msgid "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n#AuthzSVNAccessFile svnaccessfile\n and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" #: ../source/TortoiseGit_en.xml:1915 @@ -1550,12 +1550,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1955 #.(para) -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." msgstr "" #: ../source/TortoiseGit_en.xml:1969 #.(para) -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." msgstr "" #: ../source/TortoiseGit_en.xml:1977 @@ -1570,7 +1570,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1984 #.(para) -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." msgstr "" #: ../source/TortoiseGit_en.xml:1990 @@ -1640,7 +1640,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2093 #.(para) -msgid "To make the Subversion location use this type of authentication you have to change the line \nAuthType Basic\n to \nAuthType SSPI\n also you need to add \nSSPIAuth On\nSSPIAuthoritative On\nSSPIDomain <domaincontroller>\nSSPIOmitDomain on\nSSPIUsernameCase lower\nSSPIPerRequestAuth on\nSSPIOfferBasic On\n within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." +msgid "To make the Git location use this type of authentication you have to change the line \nAuthType Basic\n to \nAuthType SSPI\n also you need to add \nSSPIAuth On\nSSPIAuthoritative On\nSSPIDomain <domaincontroller>\nSSPIOmitDomain on\nSSPIUsernameCase lower\nSSPIPerRequestAuth on\nSSPIOfferBasic On\n within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" #: ../source/TortoiseGit_en.xml:2119 @@ -1660,7 +1660,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2140 #.(para) -msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." msgstr "" #: ../source/TortoiseGit_en.xml:2145 @@ -1670,7 +1670,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2150 #.(para) -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." msgstr "" #: ../source/TortoiseGit_en.xml:2158 @@ -1680,7 +1680,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2166 #.(para) -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." msgstr "" #: ../source/TortoiseGit_en.xml:2180 @@ -1695,7 +1695,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2184 #.(para) -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." msgstr "" #: ../source/TortoiseGit_en.xml:2190 @@ -1710,7 +1710,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2208 #.(para) -msgid "Here is an example of the full Apache configuration for combined Windows domain and passwd file authentication: \n<Location /svn>\n DAV svn\n SVNListParentPath on\n SVNParentPath D:\\SVN\n\n AuthName \"Subversion repositories\"\n AuthzSVNAccessFile svnaccessfile.txt\n\n# NT Domain Logins.\n AuthType SSPI\n SSPIAuth On\n SSPIAuthoritative Off\n SSPIDomain <domaincontroller>\n SSPIOfferBasic On\n\n# Htpasswd Logins.\n AuthType Basic\n AuthBasicAuthoritative Off\n AuthUserFile passwd\n\n Require valid-user\n</Location>\n" +msgid "Here is an example of the full Apache configuration for combined Windows domain and passwd file authentication: \n<Location /svn>\n DAV svn\n SVNListParentPath on\n SVNParentPath D:\\SVN\n\n AuthName \"Git repositories\"\n AuthzSVNAccessFile svnaccessfile.txt\n\n# NT Domain Logins.\n AuthType SSPI\n SSPIAuth On\n SSPIAuthoritative Off\n SSPIDomain <domaincontroller>\n SSPIOfferBasic On\n\n# Htpasswd Logins.\n AuthType Basic\n AuthBasicAuthoritative Off\n AuthUserFile passwd\n\n Require valid-user\n</Location>\n" msgstr "" #: ../source/TortoiseGit_en.xml:2238 @@ -1765,12 +1765,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2339 #.(para) -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." msgstr "" #: ../source/TortoiseGit_en.xml:2353 #.(para) -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." msgstr "" #: ../source/TortoiseGit_en.xml:2363 @@ -1795,12 +1795,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2395 #.(para) -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." msgstr "" #: ../source/TortoiseGit_en.xml:2402 #.(para) -msgid "An example <Location> block would look like this: \n<Location /svn>\n DAV svn\n SVNParentPath D:\\SVN\n SSLRequireSSL\n AuthType Basic\n AuthName \"Subversion repositories\"\n AuthUserFile passwd\n #AuthzSVNAccessFile svnaccessfile\n Require valid-user\n</Location>\n" +msgid "An example <Location> block would look like this: \n<Location /svn>\n DAV svn\n SVNParentPath D:\\SVN\n SSLRequireSSL\n AuthType Basic\n AuthName \"Git repositories\"\n AuthUserFile passwd\n #AuthzSVNAccessFile svnaccessfile\n Require valid-user\n</Location>\n" msgstr "" #: ../source/TortoiseGit_en.xml:2420 @@ -1815,7 +1815,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2424 #.(para) -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." msgstr "" #: ../source/TortoiseGit_en.xml:2430 @@ -1825,12 +1825,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2440 #.(para) -msgid "The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \nSSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n This directive grants access to the directory only if a client certificate was received and verified successfully." +msgid "The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \nSSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" #: ../source/TortoiseGit_en.xml:2449 #.(para) -msgid "To summarise, the relevant lines of the Apache configuration are: \nSSLVerifyClient Optional\n\n### Virtual host configuration for the PUBLIC host \n### (not requiring a certificate)\n\n<VirtualHost 127.0.0.1:443>\n <Directory \"pathtopublicfileroot\">\n </Directory>\n</VirtualHost>\n\n### Virtual host configuration for SUBVERSION \n### (requiring a client certificate)\n<VirtualHost 127.0.0.1:443>\n <Directory \"subversion host root path\">\n SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n </Directory>\n\n <Location /svn>\n DAV svn\n SVNParentPath /pathtorepository\n </Location>\n</VirtualHost>\n" +msgid "To summarise, the relevant lines of the Apache configuration are: \nSSLVerifyClient Optional\n\n### Virtual host configuration for the PUBLIC host \n### (not requiring a certificate)\n\n<VirtualHost 127.0.0.1:443>\n <Directory \"pathtopublicfileroot\">\n </Directory>\n</VirtualHost>\n\n### Virtual host configuration for Git \n### (requiring a client certificate)\n<VirtualHost 127.0.0.1:443>\n <Directory \"Git host root path\">\n SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n </Directory>\n\n <Location /svn>\n DAV svn\n SVNParentPath /pathtorepository\n </Location>\n</VirtualHost>\n" msgstr "" #: ../source/TortoiseGit_en.xml:2479 @@ -1840,7 +1840,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2485 #.(para) -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." msgstr "" #: ../source/TortoiseGit_en.xml:2491 @@ -1855,22 +1855,22 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2502 #.(para) -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." msgstr "" #: ../source/TortoiseGit_en.xml:2516 #.(para) -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." msgstr "" #: ../source/TortoiseGit_en.xml:2522 #.(para) -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." msgstr "" #: ../source/TortoiseGit_en.xml:2528 #.(para) -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" msgstr "" #: ../source/TortoiseGit_en.xml:2550 @@ -1915,12 +1915,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2624 #.(para) -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." msgstr "" #: ../source/TortoiseGit_en.xml:2631 #.(para) -msgid "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \nsc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n start= auto\n If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \nsc create svnserve binpath= \"\n \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n --service --root c:\\repos\" displayname= \"Subversion\" \n depend= tcpip start= auto\n You can also add a description after creating the service. This will show up in the Windows Services Manager. \nsc description svnserve \"Subversion server (svnserve)\"\n" +msgid "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \nsc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n --root c:\\repos\" displayname= \"Git\" depend= tcpip \n start= auto\n If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \nsc create svnserve binpath= \"\n \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n --service --root c:\\repos\" displayname= \"Git\" \n depend= tcpip start= auto\n You can also add a description after creating the service. This will show up in the Windows Services Manager. \nsc description svnserve \"Git server (svnserve)\"\n" msgstr "" #: ../source/TortoiseGit_en.xml:2654 @@ -1930,7 +1930,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2661 #.(para) -msgid "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \nobj= \"NT AUTHORITY\\LocalService\"\n Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +msgid "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \nobj= \"NT AUTHORITY\\LocalService\"\n Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" #: ../source/TortoiseGit_en.xml:2678 @@ -1975,7 +1975,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2755 #.(para) -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" msgstr "" #: ../source/TortoiseGit_en.xml:2773 @@ -1995,12 +1995,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2779 #.(para) -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." msgstr "" #: ../source/TortoiseGit_en.xml:2787 #.(para) -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." msgstr "" #: ../source/TortoiseGit_en.xml:2800 @@ -2015,12 +2015,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2810 #.(para) -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." msgstr "" #: ../source/TortoiseGit_en.xml:2815 #.(para) -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." msgstr "" #: ../source/TortoiseGit_en.xml:2827 @@ -2080,7 +2080,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2915 #.(para) -msgid "Further information about svnserve can be found in the Version Control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." msgstr "" #: ../source/TortoiseGit_en.xml:2923 @@ -2090,17 +2090,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2924 #.(para) -msgid "Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n[general]\nauthz-db = authz\n Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." +msgid "Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n[general]\nauthz-db = authz\n Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" #: ../source/TortoiseGit_en.xml:2946 #.(para) -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." msgstr "" #: ../source/TortoiseGit_en.xml:2951 #.(para) -msgid "If you haven't created a Subversion repository yet, it's time to do that now." +msgid "If you haven't created a Git repository yet, it's time to do that now." msgstr "" #: ../source/TortoiseGit_en.xml:2959 @@ -2115,7 +2115,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2963 #.(para) -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." msgstr "" #: ../source/TortoiseGit_en.xml:2978 @@ -2217,7 +2217,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3094 #.(para) -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." msgstr "" #: ../source/TortoiseGit_en.xml:3100 @@ -2257,7 +2257,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3141 #.(para) -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." msgstr "" #: ../source/TortoiseGit_en.xml:3147 @@ -2325,7 +2325,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3220 #.(para) -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." msgstr "" #: ../source/TortoiseGit_en.xml:3230 @@ -2390,7 +2390,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3332 #.(para) -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." msgstr "" #: ../source/TortoiseGit_en.xml:3347 @@ -2417,7 +2417,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3357 #.(para) -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." msgstr "" #: ../source/TortoiseGit_en.xml:3372 @@ -2457,7 +2457,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3411 #.(para) -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." msgstr "" #: ../source/TortoiseGit_en.xml:3417 @@ -2505,17 +2505,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3457 #.(para) -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." msgstr "" #: ../source/TortoiseGit_en.xml:3465 #.(para) -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." msgstr "" #: ../source/TortoiseGit_en.xml:3472 #.(para) -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." msgstr "" #: ../source/TortoiseGit_en.xml:3484 @@ -2530,12 +2530,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3494 #.(para) -msgid "You should know the basics of Subversion." +msgid "You should know the basics of Git." msgstr "" #: ../source/TortoiseGit_en.xml:3499 #.(para) -msgid "You should have set up a server and/or have access to a Subversion repository." +msgid "You should have set up a server and/or have access to a Git repository." msgstr "" #: ../source/TortoiseGit_en.xml:3480 @@ -2725,12 +2725,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3650 #.(para) -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " msgstr "" #: ../source/TortoiseGit_en.xml:3681 #.(para) -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." msgstr "" #: ../source/TortoiseGit_en.xml:3690 @@ -2806,7 +2806,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3736 #.(para) -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "" #: ../source/TortoiseGit_en.xml:3768 @@ -2916,7 +2916,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3916 #.(para) -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." msgstr "" #: ../source/TortoiseGit_en.xml:3925 @@ -2943,7 +2943,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3940 #.(para) -msgid "Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \nsounds http://sounds.red-bean.com/repos\nquick_graphs http://graphics.red-bean.com/repos/fast%20graphics\nskins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +msgid "Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \nsounds http://sounds.red-bean.com/repos\nquick_graphs http://graphics.red-bean.com/repos/fast%20graphics\nskins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" #: ../source/TortoiseGit_en.xml:3980 @@ -2972,7 +2972,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:4016 #.(para) -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." msgstr "" #: ../source/TortoiseGit_en.xml:4031 @@ -3171,7 +3171,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:4298 #.(para) -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." msgstr "" #: ../source/TortoiseGit_en.xml:4308 @@ -3181,7 +3181,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:4309 #.(para) -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." msgstr "" #: ../source/TortoiseGit_en.xml:4317 @@ -3323,7 +3323,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:4495 #.(para) -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." msgstr "" #: ../source/TortoiseGit_en.xml:4506 @@ -3347,7 +3347,7 @@ msgstr "" #.(para) #: ../source/TortoiseGit_en.xml:5347 #.(para) -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #: ../source/TortoiseGit_en.xml:4538 @@ -3359,7 +3359,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:4539 #.(para) -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "" #: ../source/TortoiseGit_en.xml:4546 @@ -3648,7 +3648,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:4886 #.(para) -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." msgstr "" #: ../source/TortoiseGit_en.xml:4895 @@ -3698,12 +3698,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:4965 #.(para) -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." msgstr "" #: ../source/TortoiseGit_en.xml:4920 #.(para) -msgid "Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n<<<<<<< filename\n your changes\n=======\n code merged from repository\n>>>>>>> revision\n Also, for every conflicted file Subversion places three additional files in your directory: " +msgid "Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n<<<<<<< filename\n your changes\n=======\n code merged from repository\n>>>>>>> revision\n Also, for every conflicted file Git places three additional files in your directory: " msgstr "" #: ../source/TortoiseGit_en.xml:4975 @@ -3718,7 +3718,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:4999 #.(para) -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." msgstr "" #: ../source/TortoiseGit_en.xml:5009 @@ -3767,12 +3767,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5051 #.(para) -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." msgstr "" #: ../source/TortoiseGit_en.xml:5059 #.(para) -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." msgstr "" #: ../source/TortoiseGit_en.xml:5064 @@ -3787,12 +3787,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5077 #.(para) -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." msgstr "" #: ../source/TortoiseGit_en.xml:5084 #.(para) -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." msgstr "" #: ../source/TortoiseGit_en.xml:5091 @@ -3827,7 +3827,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5129 #.(para) -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." msgstr "" #: ../source/TortoiseGit_en.xml:5136 @@ -4264,7 +4264,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5752 #.(para) -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." msgstr "" #: ../source/TortoiseGit_en.xml:5591 @@ -4351,7 +4351,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5853 #.(para) -msgid "View the Subversion properties for the selected item." +msgid "View the Git properties for the selected item." msgstr "" #: ../source/TortoiseGit_en.xml:5858 @@ -4376,17 +4376,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5875 #.(para) -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." msgstr "" #: ../source/TortoiseGit_en.xml:5884 #.(para) -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." msgstr "" #: ../source/TortoiseGit_en.xml:5890 #.(para) -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "" #: ../source/TortoiseGit_en.xml:5896 @@ -4421,7 +4421,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5945 #.(para) -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." msgstr "" #: ../source/TortoiseGit_en.xml:5904 @@ -4476,7 +4476,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:6000 #.(para) -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." msgstr "" #: ../source/TortoiseGit_en.xml:6009 @@ -4511,7 +4511,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:6041 #.(para) -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." msgstr "" #: ../source/TortoiseGit_en.xml:6054 @@ -4521,7 +4521,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:6061 #.(para) -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." msgstr "" #: ../source/TortoiseGit_en.xml:6071 @@ -4571,7 +4571,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:6129 #.(para) -msgid "Because the formatting depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "" #: ../source/TortoiseGit_en.xml:6139 @@ -4790,7 +4790,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:6392 #.(para) -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." msgstr "" #: ../source/TortoiseGit_en.xml:6410 @@ -5190,7 +5190,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:6853 #.(para) -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." msgstr "" #: ../source/TortoiseGit_en.xml:6861 @@ -5275,7 +5275,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:6985 #.(para) -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." msgstr "" #: ../source/TortoiseGit_en.xml:6998 @@ -5285,7 +5285,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:6999 #.(para) -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "" #: ../source/TortoiseGit_en.xml:7007 @@ -5335,7 +5335,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7014 #.(para) -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " msgstr "" #: ../source/TortoiseGit_en.xml:7054 @@ -5370,7 +5370,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7089 #.(para) -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " msgstr "" #: ../source/TortoiseGit_en.xml:7099 @@ -5390,7 +5390,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7106 #.(para) -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "" #: ../source/TortoiseGit_en.xml:7114 @@ -5400,7 +5400,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7130 #.(para) -msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." msgstr "" #: ../source/TortoiseGit_en.xml:7147 @@ -5410,12 +5410,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7158 #.(para) -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." msgstr "" #: ../source/TortoiseGit_en.xml:7172 #.(para) -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." msgstr "" #: ../source/TortoiseGit_en.xml:7185 @@ -5509,12 +5509,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7301 #.(para) -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "" #: ../source/TortoiseGit_en.xml:7307 #.(para) -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" msgstr "" #: ../source/TortoiseGit_en.xml:7317 @@ -5566,7 +5566,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7363 #.(para) -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." msgstr "" #: ../source/TortoiseGit_en.xml:7371 @@ -5596,12 +5596,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7395 #.(para) -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." msgstr "" #: ../source/TortoiseGit_en.xml:7403 #.(para) -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #: ../source/TortoiseGit_en.xml:7417 @@ -5611,7 +5611,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7418 #.(para) -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." msgstr "" #: ../source/TortoiseGit_en.xml:7425 @@ -5706,12 +5706,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7520 #.(para) -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." msgstr "" #: ../source/TortoiseGit_en.xml:7531 #.(para) -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." msgstr "" #: ../source/TortoiseGit_en.xml:7542 @@ -5721,7 +5721,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7543 #.(para) -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." msgstr "" #: ../source/TortoiseGit_en.xml:7553 @@ -5736,37 +5736,37 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7559 #.(title) -msgid "Explorer property page, Subversion tab" +msgid "Explorer property page, Git tab" msgstr "" #: ../source/TortoiseGit_en.xml:7557 #.(para) -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." msgstr "" #: ../source/TortoiseGit_en.xml:7579 #.(title) -msgid "Subversion Properties" +msgid "Git Properties" msgstr "" #: ../source/TortoiseGit_en.xml:7581 #.(primary) -msgid "Subversion properties" +msgid "Git properties" msgstr "" #: ../source/TortoiseGit_en.xml:7587 #.(title) -msgid "Subversion property page" +msgid "Git property page" msgstr "" #: ../source/TortoiseGit_en.xml:7585 #.(para) -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." msgstr "" #: ../source/TortoiseGit_en.xml:7602 #.(para) -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." msgstr "" #: ../source/TortoiseGit_en.xml:7609 @@ -5811,17 +5811,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7616 #.(para) -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "" #: ../source/TortoiseGit_en.xml:7667 #.(para) -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." msgstr "" #: ../source/TortoiseGit_en.xml:7677 #.(para) -msgid "For more information about properties in Subversion see the Special Properties." +msgid "For more information about properties in Git see the Special Properties." msgstr "" #: ../source/TortoiseGit_en.xml:7684 @@ -5926,12 +5926,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7795 #.(para) -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." msgstr "" #: ../source/TortoiseGit_en.xml:7800 #.(para) -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." msgstr "" #: ../source/TortoiseGit_en.xml:7817 @@ -5956,7 +5956,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7837 #.(para) -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." msgstr "" #: ../source/TortoiseGit_en.xml:7843 @@ -5966,7 +5966,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7844 #.(para) -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." msgstr "" #: ../source/TortoiseGit_en.xml:7853 @@ -6006,7 +6006,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7909 #.(para) -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." msgstr "" #: ../source/TortoiseGit_en.xml:7922 @@ -6093,7 +6093,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8042 #.(para) -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." msgstr "" #: ../source/TortoiseGit_en.xml:8055 @@ -6125,7 +6125,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8085 #.(para) -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." msgstr "" #: ../source/TortoiseGit_en.xml:8095 @@ -6262,7 +6262,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8272 #.(para) -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " msgstr "" #: ../source/TortoiseGit_en.xml:8316 @@ -6288,7 +6288,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8326 #.(para) -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." msgstr "" #: ../source/TortoiseGit_en.xml:8336 @@ -6318,7 +6318,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8369 #.(para) -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." msgstr "" #: ../source/TortoiseGit_en.xml:8378 @@ -6330,12 +6330,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8380 #.(para) -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." msgstr "" #: ../source/TortoiseGit_en.xml:8389 #.(para) -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "" #: ../source/TortoiseGit_en.xml:8399 @@ -6355,12 +6355,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8419 #.(para) -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." msgstr "" #: ../source/TortoiseGit_en.xml:8427 #.(para) -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." msgstr "" #: ../source/TortoiseGit_en.xml:8442 @@ -6405,7 +6405,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8490 #.(para) -msgid "If you are merging revisions in chunks, the method shown in the subversion book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." +msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." msgstr "" #: ../source/TortoiseGit_en.xml:8497 @@ -6430,7 +6430,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8535 #.(para) -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." msgstr "" #: ../source/TortoiseGit_en.xml:8543 @@ -6525,7 +6525,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8645 #.(para) -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" msgstr "" #: ../source/TortoiseGit_en.xml:8662 @@ -6560,12 +6560,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8706 #.(para) -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." msgstr "" #: ../source/TortoiseGit_en.xml:8723 #.(para) -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "" #: ../source/TortoiseGit_en.xml:8730 @@ -6580,7 +6580,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8745 #.(para) -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." msgstr "" #: ../source/TortoiseGit_en.xml:8755 @@ -6620,7 +6620,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8759 #.(para) -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " msgstr "" #: ../source/TortoiseGit_en.xml:8801 @@ -6630,7 +6630,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8811 #.(para) -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." msgstr "" #: ../source/TortoiseGit_en.xml:8819 @@ -6745,17 +6745,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8945 #.(para) -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " msgstr "" #: ../source/TortoiseGit_en.xml:8969 #.(para) -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." msgstr "" #: ../source/TortoiseGit_en.xml:8976 #.(title) -msgid "How Locking Works in Subversion" +msgid "How Locking Works in Git" msgstr "" #: ../source/TortoiseGit_en.xml:8977 @@ -6770,7 +6770,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8990 #.(para) -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." msgstr "" #: ../source/TortoiseGit_en.xml:9006 @@ -6780,7 +6780,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:9012 #.(para) -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." msgstr "" #: ../source/TortoiseGit_en.xml:9022 @@ -6850,7 +6850,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:9113 #.(para) -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." msgstr "" #: ../source/TortoiseGit_en.xml:9125 @@ -6865,7 +6865,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:9136 #.(para) -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." msgstr "" #: ../source/TortoiseGit_en.xml:9145 @@ -6875,7 +6875,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:9146 #.(para) -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." msgstr "" #: ../source/TortoiseGit_en.xml:9152 @@ -7652,7 +7652,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10131 #.(para) -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." msgstr "" #: ../source/TortoiseGit_en.xml:10141 @@ -7697,7 +7697,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10191 #.(title) -msgid "Exporting a Subversion Working Copy" +msgid "Exporting a Git Working Copy" msgstr "" #: ../source/TortoiseGit_en.xml:10193 @@ -7752,7 +7752,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10266 #.(para) -msgid "The export dialog does not allow exporting single files, even though Subversion can." +msgid "The export dialog does not allow exporting single files, even though Git can." msgstr "" #: ../source/TortoiseGit_en.xml:10270 @@ -7859,7 +7859,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10375 #.(para) -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." msgstr "" #: ../source/TortoiseGit_en.xml:10381 @@ -7904,7 +7904,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10415 #.(para) -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." msgstr "" #: ../source/TortoiseGit_en.xml:10428 @@ -8085,12 +8085,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10722 #.(para) -msgid "Because the issue tracker integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "" #: ../source/TortoiseGit_en.xml:10729 #.(para) -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." msgstr "" #: ../source/TortoiseGit_en.xml:10740 @@ -8150,7 +8150,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10799 #.(para) -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." msgstr "" #: ../source/TortoiseGit_en.xml:10811 @@ -8180,7 +8180,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10895 #.(para) -msgid "Because the repo viewer integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "" #: ../source/TortoiseGit_en.xml:10904 @@ -8215,7 +8215,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10921 #.(para) -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." msgstr "" #: ../source/TortoiseGit_en.xml:10931 @@ -8285,12 +8285,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:11001 #.(para) -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." msgstr "" #: ../source/TortoiseGit_en.xml:11007 #.(para) -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." msgstr "" #: ../source/TortoiseGit_en.xml:11015 @@ -8310,12 +8310,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:11043 #.(term) -msgid "Subversion configuration file" +msgid "Git configuration file" msgstr "" #: ../source/TortoiseGit_en.xml:11045 #.(para) -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." msgstr "" #: ../source/TortoiseGit_en.xml:11070 @@ -8325,12 +8325,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:11072 #.(para) -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." msgstr "" #: ../source/TortoiseGit_en.xml:11079 #.(para) -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." msgstr "" #: ../source/TortoiseGit_en.xml:11084 @@ -8445,7 +8445,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:11220 #.(para) -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." msgstr "" #: ../source/TortoiseGit_en.xml:11232 @@ -8830,12 +8830,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:11652 #.(para) -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." msgstr "" #: ../source/TortoiseGit_en.xml:11657 #.(para) -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." msgstr "" #: ../source/TortoiseGit_en.xml:11664 @@ -8920,7 +8920,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:11759 #.(para) -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." msgstr "" #: ../source/TortoiseGit_en.xml:11769 @@ -8950,7 +8950,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:11809 #.(para) -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." msgstr "" #: ../source/TortoiseGit_en.xml:11819 @@ -9024,7 +9024,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:11925 #.(para) -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." msgstr "" #: ../source/TortoiseGit_en.xml:11930 @@ -9179,7 +9179,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:12158 #.(para) -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" msgstr "" #: ../source/TortoiseGit_en.xml:12165 @@ -9469,7 +9469,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:12459 #.(para) -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." msgstr "" #: ../source/TortoiseGit_en.xml:12469 @@ -9549,7 +9549,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:12533 #.(para) -msgid "Called before the actual Subversion update begins." +msgid "Called before the actual Git update begins." msgstr "" #: ../source/TortoiseGit_en.xml:12539 @@ -9661,7 +9661,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:12711 #.(para) -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." msgstr "" #: ../source/TortoiseGit_en.xml:12715 @@ -9771,7 +9771,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:12839 #.(para) -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." msgstr "" #: ../source/TortoiseGit_en.xml:12848 @@ -9886,7 +9886,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:12998 #.(title) -msgid "Subversion Working Folders" +msgid "Git Working Folders" msgstr "" #: ../source/TortoiseGit_en.xml:13000 @@ -9901,7 +9901,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13005 #.(para) -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." msgstr "" #: ../source/TortoiseGit_en.xml:13012 @@ -9911,7 +9911,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13016 #.(para) -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." msgstr "" #: ../source/TortoiseGit_en.xml:13026 @@ -9966,7 +9966,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13077 #.(para) -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." msgstr "" #: ../source/TortoiseGit_en.xml:13091 @@ -9976,7 +9976,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13092 #.(para) -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." msgstr "" #: ../source/TortoiseGit_en.xml:13100 @@ -10408,7 +10408,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13406 #.(para) -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " msgstr "" #: ../source/TortoiseGit_en.xml:13524 @@ -10434,7 +10434,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13612 #.(para) -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." msgstr "" #: ../source/TortoiseGit_en.xml:13624 @@ -10444,7 +10444,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13634 #.(para) -msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." msgstr "" #: ../source/TortoiseGit_en.xml:13650 @@ -10504,7 +10504,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13715 #.(para) -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." msgstr "" #: ../source/TortoiseGit_en.xml:13721 @@ -10524,7 +10524,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13737 #.(para) -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." msgstr "" #: ../source/TortoiseGit_en.xml:13748 @@ -10671,7 +10671,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13938 #.(para) -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." msgstr "" #: ../source/TortoiseGit_en.xml:13949 @@ -10741,7 +10741,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:14038 #.(para) -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." msgstr "" #: ../source/TortoiseGit_en.xml:14057 @@ -10756,7 +10756,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:14066 #.(para) -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" msgstr "" #: ../source/TortoiseGit_en.xml:14070 @@ -11285,7 +11285,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:14573 #.(para) -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." msgstr "" #: ../source/TortoiseGit_en.xml:14585 @@ -11878,17 +11878,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15167 #.(para) -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." msgstr "" #: ../source/TortoiseGit_en.xml:15176 #.(para) -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." msgstr "" #: ../source/TortoiseGit_en.xml:15182 #.(para) -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." msgstr "" #: ../source/TortoiseGit_en.xml:15190 @@ -11942,7 +11942,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15240 #.(para) -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." msgstr "" #: ../source/TortoiseGit_en.xml:15247 @@ -11973,7 +11973,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15275 #.(para) -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." msgstr "" #: ../source/TortoiseGit_en.xml:15282 @@ -11990,7 +11990,7 @@ msgstr "" #.(para) #: ../source/TortoiseGit_en.xml:15373 #.(para) -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." msgstr "" #: ../source/TortoiseGit_en.xml:15293 @@ -12008,7 +12008,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15300 #.(para) -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." msgstr "" #: ../source/TortoiseGit_en.xml:15308 @@ -12145,7 +12145,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15453 #.(para) -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." msgstr "" #: ../source/TortoiseGit_en.xml:15460 @@ -12254,7 +12254,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15555 #.(para) -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." msgstr "" #: ../source/TortoiseGit_en.xml:15560 @@ -12335,7 +12335,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15641 #.(para) -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." msgstr "" #: ../source/TortoiseGit_en.xml:15655 @@ -12355,7 +12355,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15670 #.(para) -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." msgstr "" #: ../source/TortoiseGit_en.xml:15678 @@ -12380,12 +12380,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15712 #.(para) -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." msgstr "" #: ../source/TortoiseGit_en.xml:15721 #.(para) -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." msgstr "" #: ../source/TortoiseGit_en.xml:15735 @@ -12405,12 +12405,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15756 #.(para) -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "" #: ../source/TortoiseGit_en.xml:15763 #.(para) -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "" #: ../source/TortoiseGit_en.xml:15770 @@ -12455,22 +12455,22 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15833 #.(para) -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." msgstr "" #: ../source/TortoiseGit_en.xml:15843 #.(para) -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." msgstr "" #: ../source/TortoiseGit_en.xml:15848 #.(para) -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "" #: ../source/TortoiseGit_en.xml:15854 #.(para) -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" msgstr "" #: ../source/TortoiseGit_en.xml:15865 @@ -12485,7 +12485,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:15875 #.(para) -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." msgstr "" #: ../source/TortoiseGit_en.xml:15888 @@ -12595,7 +12595,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16038 #.(para) -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "" #: ../source/TortoiseGit_en.xml:16047 @@ -12685,7 +12685,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16190 #.(para) -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "" #: ../source/TortoiseGit_en.xml:16198 @@ -12720,22 +12720,22 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16232 #.(para) -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "" #: ../source/TortoiseGit_en.xml:16247 #.(para) -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "" #: ../source/TortoiseGit_en.xml:16256 #.(para) -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "" #: ../source/TortoiseGit_en.xml:16273 #.(para) -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "" #: ../source/TortoiseGit_en.xml:16281 @@ -12745,7 +12745,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16283 #.(para) -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "" #: ../source/TortoiseGit_en.xml:16293 @@ -12755,7 +12755,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16295 #.(para) -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "" #: ../source/TortoiseGit_en.xml:16307 @@ -12780,7 +12780,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16338 #.(para) -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "" #: ../source/TortoiseGit_en.xml:16347 @@ -12800,7 +12800,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16363 #.(para) -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "" #: ../source/TortoiseGit_en.xml:16372 @@ -12845,7 +12845,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16416 #.(para) -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "" #: ../source/TortoiseGit_en.xml:16429 @@ -12855,7 +12855,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16431 #.(para) -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "" #: ../source/TortoiseGit_en.xml:16446 @@ -12885,7 +12885,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16486 #.(para) -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "" #: ../source/TortoiseGit_en.xml:16495 @@ -12920,12 +12920,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16527 #.(para) -msgid "A frequently-used abbreviation for Subversion." +msgid "A frequently-used abbreviation for Git." msgstr "" #: ../source/TortoiseGit_en.xml:16530 #.(para) -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "" #: ../source/TortoiseGit_en.xml:16539 @@ -12935,7 +12935,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:16553 #.(para) -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "" #: ../source/TortoiseGit_en.xml:16561 diff --git a/doc/po/TortoiseSVN_de.po b/doc/po/TortoiseSVN_de.po index dc9ead5..08fdec7 100644 --- a/doc/po/TortoiseSVN_de.po +++ b/doc/po/TortoiseSVN_de.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2009-01-12 08:46 +0000\n" "PO-Revision-Date: 2009-01-12 10:05+0100\n" "Last-Translator: Lübbe Onken \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -54,8 +54,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Ein Subversion-Client für Windows" +msgid "A Git client for Windows" +msgstr "Ein Git-Client für Windows" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -135,8 +135,8 @@ msgstr "Zielgruppe" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "Dieses Buch ist für Computerbenutzer geschrieben, welche Subversion für die Handhabung ihrer Daten nutzen wollen, aber den Umgang mit der Kommandozeile nicht gewohnt sind. Da TortoiseGit eine Windows Shell-Erweiterung ist, wird angenommen, dass der Leser den Umgang mit dem Explorer gewohnt ist und weiß, wie man diesen benutzt." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "Dieses Buch ist für Computerbenutzer geschrieben, welche Git für die Handhabung ihrer Daten nutzen wollen, aber den Umgang mit der Kommandozeile nicht gewohnt sind. Da TortoiseGit eine Windows Shell-Erweiterung ist, wird angenommen, dass der Leser den Umgang mit dem Explorer gewohnt ist und weiß, wie man diesen benutzt." #. (title) #: ../source/TortoiseGit_en.xml:84 @@ -155,18 +155,18 @@ msgstr "In wird erklärt, was TortoiseGit #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." -msgstr "In geben wir eine kurze Einführung in das Subversion Versionskontrollsystem, welches TortoiseGit zugrunde liegt. Dieses Kapitel stammt aus der Dokumentation des Subversion Projekts und erklärt die verschiedenen Ansätze zur Versionskontrolle und wie Subversion arbeitet." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." +msgstr "In geben wir eine kurze Einführung in das Git Versionskontrollsystem, welches TortoiseGit zugrunde liegt. Dieses Kapitel stammt aus der Dokumentation des Git Projekts und erklärt die verschiedenen Ansätze zur Versionskontrolle und wie Git arbeitet." #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." -msgstr "Die allermeisten Subversion-Nutzer müssen wahrscheinlich nie selbst einen Server einrichten. Dennoch widmet sich das ganze folgende Kapitel diesem Thema und ist für Administratoren eine nützliche Lektüre." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgstr "Die allermeisten Git-Nutzer müssen wahrscheinlich nie selbst einen Server einrichten. Dennoch widmet sich das ganze folgende Kapitel diesem Thema und ist für Administratoren eine nützliche Lektüre." #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr "In wird erklärt, wie ein lokales Projektarchiv angelegt wird, damit Sie TortoiseGit und Subversion auf einem einzigen PC testen können. Weiterhin wird ein wenig auf die Verwaltung von Projektarchiven eingegangen, was für Projektarchive, die sich auf einem Server befinden, relevant ist." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr "In wird erklärt, wie ein lokales Projektarchiv angelegt wird, damit Sie TortoiseGit und Git auf einem einzigen PC testen können. Weiterhin wird ein wenig auf die Verwaltung von Projektarchiven eingegangen, was für Projektarchive, die sich auf einem Server befinden, relevant ist." #. (para) #: ../source/TortoiseGit_en.xml:113 @@ -190,8 +190,8 @@ msgstr "Der beschreibt, wie die TortoiseGit #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." -msgstr "In geben einen Überblick über die Zusammenhänge zwischen TortoiseGit Befehlen und ihren Äquivalenten in dem Subversion Kommandozeilenprogramm svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." +msgstr "In geben einen Überblick über die Zusammenhänge zwischen TortoiseGit Befehlen und ihren Äquivalenten in dem Git Kommandozeilenprogramm svn.exe." #. (title) #: ../source/TortoiseGit_en.xml:144 @@ -215,8 +215,8 @@ msgstr "Gemeinschaft" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "Sowohl TortoiseGit als auch Subversion werden von verschiedenen Gruppen von Leuten entwickelt. Diese Leute kommen aus vielen verschiedenen Ländern der Welt und haben sich zusammengefunden, um diese tollen Programme weiter zu entwickeln." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "Sowohl TortoiseGit als auch Git werden von verschiedenen Gruppen von Leuten entwickelt. Diese Leute kommen aus vielen verschiedenen Ländern der Welt und haben sich zusammengefunden, um diese tollen Programme weiter zu entwickeln." #. (title) #: ../source/TortoiseGit_en.xml:180 @@ -265,13 +265,13 @@ msgstr "für die Hilfe bei der Dokumentation und bei der Fehlerjagd" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "Das Subversion Buch" +msgid "The Git Book" +msgstr "Das Git Buch" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "für die großartige Einführung in Subversion und das Kapitel 2, das wir hier kopiert haben." +msgid "for the great introduction to Git and its chapter 2 which we copied here" +msgstr "für die großartige Einführung in Git und das Kapitel 2, das wir hier kopiert haben." #. (term) #: ../source/TortoiseGit_en.xml:225 @@ -346,7 +346,7 @@ msgstr "Wichtige Hinweise im Dokument." #. (para) #: ../source/TortoiseGit_en.xml:300 msgid "Tips that make your life easier." -msgstr "Tipps, die Ihre Arbeit mit Subversion erleichtern." +msgstr "Tipps, die Ihre Arbeit mit Git erleichtern." #. (para) #: ../source/TortoiseGit_en.xml:305 @@ -384,13 +384,13 @@ msgstr "Was ist TortoiseGit?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." -msgstr "TortoiseGit ist ein freies Open-Source Programm für das Subversion Versionskontrollsystem. Das heißt, TortoiseGit verwaltet Dateien und Ordner über die Zeit. Dateien werden in einem zentralen Projektarchiv gespeichert. Das Projektarchiv entspricht einem normalen Dateiserver, mit der Besonderheit, dass sämtliche Änderungen protokolliert werden. Dies erlaubt es, ältere Versionen von Dateien zurückzuholen und Änderungen über die Zeit zu verfolgen. Aus diesem Grund sehen viele Leute Subversion als eine Art Zeitmaschine an." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." +msgstr "TortoiseGit ist ein freies Open-Source Programm für das Git Versionskontrollsystem. Das heißt, TortoiseGit verwaltet Dateien und Ordner über die Zeit. Dateien werden in einem zentralen Projektarchiv gespeichert. Das Projektarchiv entspricht einem normalen Dateiserver, mit der Besonderheit, dass sämtliche Änderungen protokolliert werden. Dies erlaubt es, ältere Versionen von Dateien zurückzuholen und Änderungen über die Zeit zu verfolgen. Aus diesem Grund sehen viele Leute Git als eine Art Zeitmaschine an." #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." -msgstr "SCMEinige Versionskontrollsysteme sind zugleich Programmkonfigurations-Managementsysteme (Software Configuration Management Systems, SCM). Diese Systeme sind speziell dazu ausgelegt, Quellcode zu handhaben und haben viele Funktionen, welche spezifisch für die Softwareentwicklung sind - so verstehen diese etwa verschiedene Programmiersprachen oder stellen Hilfsmittel für die Erstellung von Programmen zur Verfügung. Subversion hingegen ist kein solches System; es ist allgemein gehalten, so dass es für die Handhabung von beliebigen Dateien, einschließlich Quellcode, geeignet ist." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgstr "SCMEinige Versionskontrollsysteme sind zugleich Programmkonfigurations-Managementsysteme (Software Configuration Management Systems, SCM). Diese Systeme sind speziell dazu ausgelegt, Quellcode zu handhaben und haben viele Funktionen, welche spezifisch für die Softwareentwicklung sind - so verstehen diese etwa verschiedene Programmiersprachen oder stellen Hilfsmittel für die Erstellung von Programmen zur Verfügung. Git hingegen ist kein solches System; es ist allgemein gehalten, so dass es für die Handhabung von beliebigen Dateien, einschließlich Quellcode, geeignet ist." #. (title) #: ../source/TortoiseGit_en.xml:368 @@ -399,18 +399,18 @@ msgstr "Geschichte von TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "Tim Kemp fand im Jahr 2002, dass Subversion ein sehr gutes Versionskontrollsystem sei, aber es fehle eine gute grafische Oberfläche dazu. Die Idee einer Windows Shell-Integration wurde von dem Windows-Programm TortoiseCVS für das ältere CVS Versionskontrollsystem inspiriert." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "Tim Kemp fand im Jahr 2002, dass Git ein sehr gutes Versionskontrollsystem sei, aber es fehle eine gute grafische Oberfläche dazu. Die Idee einer Windows Shell-Integration wurde von dem Windows-Programm TortoiseCVS für das ältere CVS Versionskontrollsystem inspiriert." #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Tim studierte den Quellcode von TortoiseCVS und benutzte diesen als Basis für TortoiseGit. Er startete dann das Projekt, registrierte die Domäne TortoiseGit.org und stellte den Quellcode online zur Verfügung. Während dieser Zeit suchte Stefan Küng nach einem guten Versionskontrollsystem und fand Subversion und den Quellcode von TortoiseGit. Da TortoiseGit noch nicht für den normalen Gebrauch nutzbar war, fing er an, TortoiseGit weiter zu entwickeln. Schon bald hatte er den größten Teil des Programmcodes neu geschrieben und fügte Funktionen und Befehle hinzu bis zu einem Punkt, wo von dem ursprünglichen Code nichts mehr übrig war." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Tim studierte den Quellcode von TortoiseCVS und benutzte diesen als Basis für TortoiseGit. Er startete dann das Projekt, registrierte die Domäne TortoiseGit.org und stellte den Quellcode online zur Verfügung. Während dieser Zeit suchte Stefan Küng nach einem guten Versionskontrollsystem und fand Git und den Quellcode von TortoiseGit. Da TortoiseGit noch nicht für den normalen Gebrauch nutzbar war, fing er an, TortoiseGit weiter zu entwickeln. Schon bald hatte er den größten Teil des Programmcodes neu geschrieben und fügte Funktionen und Befehle hinzu bis zu einem Punkt, wo von dem ursprünglichen Code nichts mehr übrig war." #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." -msgstr "Während Subversion immer stabiler wurde, zog es immer mehr Benutzer an, welche auch TortoiseGit als ihren Subversion Client verwenden. Die Benutzerzahl wuchs schnell (und wächst täglich weiter). Zu dieser Zeit bot Lübbe Onken an, beim Design zu helfen und kreierte die Symbole und das Logo für TortoiseGit. Er kümmert sich seitdem auch um die Webseite und das Übersetzungsmanagement." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgstr "Während Git immer stabiler wurde, zog es immer mehr Benutzer an, welche auch TortoiseGit als ihren Git Client verwenden. Die Benutzerzahl wuchs schnell (und wächst täglich weiter). Zu dieser Zeit bot Lübbe Onken an, beim Design zu helfen und kreierte die Symbole und das Logo für TortoiseGit. Er kümmert sich seitdem auch um die Webseite und das Übersetzungsmanagement." #. (title) #: ../source/TortoiseGit_en.xml:399 @@ -419,8 +419,8 @@ msgstr "Eigenschaften von TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." -msgstr "Was macht TortoiseGit zu einem guten Subversion Client? Hier eine Liste der herausragenden Eigenschaften:" +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." +msgstr "Was macht TortoiseGit zu einem guten Git Client? Hier eine Liste der herausragenden Eigenschaften:" #. (term) #: ../source/TortoiseGit_en.xml:406 @@ -459,18 +459,18 @@ msgstr "Der Status von jeder Datei unter Versionskontrolle wird durch ein kleine #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Einfacher Zugriff auf Subversion-Befehle" +msgid "Easy access to Git commands" +msgstr "Einfacher Zugriff auf Git-Befehle" #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." -msgstr "Alle Befehle von Subversion sind über das Kontextmenü des Explorers zugänglich; TortoiseGit fügt dort ein eigenes Untermenü ein." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgstr "Alle Befehle von Git sind über das Kontextmenü des Explorers zugänglich; TortoiseGit fügt dort ein eigenes Untermenü ein." #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "Da TortoiseGit ein Subversion Client ist, möchten wir auch ein paar Features von Subversion selbst erwähnen:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" +msgstr "Da TortoiseGit ein Git Client ist, möchten wir auch ein paar Features von Git selbst erwähnen:" #. (term) #: ../source/TortoiseGit_en.xml:460 @@ -479,8 +479,8 @@ msgstr "Versionierung von Verzeichnissen" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS speichert nur die Geschichte von einzelnen Dateien, aber Subversion implementiert ein virtuelles kontrolliertes Dateisystem, welches auch Änderungen an Ordnern über die Zeit speichert. Dateien und Ordner werden kontrolliert. Daher gibt es Befehle, um Dateien/Ordner zu verschieben. Und der Kopiere... Befehl arbeitet mit Dateien und Ordnern." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS speichert nur die Geschichte von einzelnen Dateien, aber Git implementiert ein virtuelles kontrolliertes Dateisystem, welches auch Änderungen an Ordnern über die Zeit speichert. Dateien und Ordner werden kontrolliert. Daher gibt es Befehle, um Dateien/Ordner zu verschieben. Und der Kopiere... Befehl arbeitet mit Dateien und Ordnern." #. (term) #: ../source/TortoiseGit_en.xml:475 @@ -509,8 +509,8 @@ msgstr "Auswahl an Netzwerkschichten" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "Subversion hat einen abstrakten Begriff des Zugriffs auf das Projektarchiv, der es einfach macht, neue Netzwerkschichten zu implementieren. Subversions am weitesten fortgeschrittener Netzwerkserver ist ein Modul für den Apache Web-Server, welcher eine Variante von HTTP genannt WebDAV/DeltaV nutzt. Dies gibt Subversion einen Vorteil an Stabilität und Interoperabilität, und stellt verschiedene Schlüsselfunktionen gratis zur Verfügung: Anmeldung, Autorisierung, Netzwerkdatenkompression, Verschlüsselung via SSL und das Betrachten des Projektarchivs in einem Web-Browser zum Beispiel. Ein kleinerer Subversion Server ist ebenfalls vorhanden. Dieser Server nutzt ein eigenes Netzwerkprotokoll, welches über SSH getunnelt werden kann." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "Git hat einen abstrakten Begriff des Zugriffs auf das Projektarchiv, der es einfach macht, neue Netzwerkschichten zu implementieren. Gits am weitesten fortgeschrittener Netzwerkserver ist ein Modul für den Apache Web-Server, welcher eine Variante von HTTP genannt WebDAV/DeltaV nutzt. Dies gibt Git einen Vorteil an Stabilität und Interoperabilität, und stellt verschiedene Schlüsselfunktionen gratis zur Verfügung: Anmeldung, Autorisierung, Netzwerkdatenkompression, Verschlüsselung via SSL und das Betrachten des Projektarchivs in einem Web-Browser zum Beispiel. Ein kleinerer Git Server ist ebenfalls vorhanden. Dieser Server nutzt ein eigenes Netzwerkprotokoll, welches über SSH getunnelt werden kann." #. (term) #: ../source/TortoiseGit_en.xml:516 @@ -519,8 +519,8 @@ msgstr "Konsistente Datenhaltung" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." -msgstr "Subversion drückt Dateiunterschiede mit Hilfe eines binären Differenzalgorithmus aus, welcher identisch für Text- und Binärdateien arbeitet. Beide Dateiarten werden gleich komprimiert im Projektarchiv abgespeichert, und jeweils nur diese Differenz wird in beiden Richtungen übers Netzwerk übertragen." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgstr "Git drückt Dateiunterschiede mit Hilfe eines binären Differenzalgorithmus aus, welcher identisch für Text- und Binärdateien arbeitet. Beide Dateiarten werden gleich komprimiert im Projektarchiv abgespeichert, und jeweils nur diese Differenz wird in beiden Richtungen übers Netzwerk übertragen." #. (term) #: ../source/TortoiseGit_en.xml:529 @@ -529,8 +529,8 @@ msgstr "Effizientes Verzweigen und Markieren" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." -msgstr "Die Kosten für Verzweigen und Markieren müssen nicht proportional zur Projektgröße sein. Subversion erstellt Zweige und Marken durch einfaches Kopieren des Projektes. Dabei wird ein Mechanismus ähnlich dem eines Verweises verwendet. Diese Operationen benötigen deshalb nur wenig Zeit und Speicherplatz." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgstr "Die Kosten für Verzweigen und Markieren müssen nicht proportional zur Projektgröße sein. Git erstellt Zweige und Marken durch einfaches Kopieren des Projektes. Dabei wird ein Mechanismus ähnlich dem eines Verweises verwendet. Diese Operationen benötigen deshalb nur wenig Zeit und Speicherplatz." #. (term) #: ../source/TortoiseGit_en.xml:542 @@ -539,8 +539,8 @@ msgstr "Wartbarkeit" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Subversion hat keine Altlasten; es ist als Sammlung von C-Bibliotheken mit gut definierten API's implementiert. Dies macht Subversion extrem gut wartbar und durch andere Programme und Programmiersprachen nutzbar." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." +msgstr "Git hat keine Altlasten; es ist als Sammlung von C-Bibliotheken mit gut definierten API's implementiert. Dies macht Git extrem gut wartbar und durch andere Programme und Programmiersprachen nutzbar." #. (title) #: ../source/TortoiseGit_en.xml:558 @@ -684,23 +684,23 @@ msgstr "Grundlagen" #. (primary) #: ../source/TortoiseGit_en.xml:725 -msgid "Subversion book" -msgstr "Subversion Buch" +msgid "Git book" +msgstr "Git Buch" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." -msgstr "Dieses Kapitel ist eine leicht veränderte Version desselben Kapitels aus dem Subversion Buch. Das vollständige Subversion Buch findet Sie unter folgender Adresse: http://svnbook.red-bean.com/ ." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." +msgstr "Dieses Kapitel ist eine leicht veränderte Version desselben Kapitels aus dem Git Buch. Das vollständige Git Buch findet Sie unter folgender Adresse: http://svnbook.red-bean.com/ ." #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." -msgstr "Dieses Kapitel ist eine kurze, beiläufige Einführung in Subversion. Falls Sie noch nie etwas von Versionskontrolle gehört haben, dann ist dieses Kapitel definitiv etwas für Sie. Wir beginnen mit einer Diskussion über allgemeine Konzepte der Versionskontrolle, arbeiten uns dann vor in die spezifischen Ideen hinter Subversion und zeigen ein paar einfache Beispiele zur Benutzung von Subversion." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." +msgstr "Dieses Kapitel ist eine kurze, beiläufige Einführung in Git. Falls Sie noch nie etwas von Versionskontrolle gehört haben, dann ist dieses Kapitel definitiv etwas für Sie. Wir beginnen mit einer Diskussion über allgemeine Konzepte der Versionskontrolle, arbeiten uns dann vor in die spezifischen Ideen hinter Git und zeigen ein paar einfache Beispiele zur Benutzung von Git." #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." -msgstr "Obwohl die hier gezeigten Beispiele Personen zeigen, die mit Quellcode arbeiten, beachten Sie bitte, dass Subversion jegliche Art von Daten verarbeiten kann - es ist nicht auf Quellcode beschränkt." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." +msgstr "Obwohl die hier gezeigten Beispiele Personen zeigen, die mit Quellcode arbeiten, beachten Sie bitte, dass Git jegliche Art von Daten verarbeiten kann - es ist nicht auf Quellcode beschränkt." #. (title) #. (title) @@ -720,8 +720,8 @@ msgstr "Projektarchiv" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." -msgstr " Projektarchiv Subversion ist ein zentralisiertes System für die Verteilung von Informationen. In seinem Kern befindet sich eine Datenbank, welche die Informationen in Form eines Dateibaumes - einer typischen Hierarchie von Dateien und Ordnern - abspeichert. Eine beliebige Anzahl von Clients kontaktiert das Projektarchiv und liest und schreibt von/in diese Dateien. Durch ein Schreiben von Daten stellt ein Client diese Daten auch anderen zur Verfügung, durch Lesen von Daten bekommt ein Client die Informationen von anderen." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgstr " Projektarchiv Git ist ein zentralisiertes System für die Verteilung von Informationen. In seinem Kern befindet sich eine Datenbank, welche die Informationen in Form eines Dateibaumes - einer typischen Hierarchie von Dateien und Ordnern - abspeichert. Eine beliebige Anzahl von Clients kontaktiert das Projektarchiv und liest und schreibt von/in diese Dateien. Durch ein Schreiben von Daten stellt ein Client diese Daten auch anderen zur Verfügung, durch Lesen von Daten bekommt ein Client die Informationen von anderen." #. (title) #: ../source/TortoiseGit_en.xml:767 @@ -730,8 +730,8 @@ msgstr "Ein typisches Client/Server System" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." -msgstr "Warum ist dies so interessant? Bis jetzt klingt dies alles wie die Definition eines typischen Dateiservers. Und tatsächlich ist das Projektarchiv eine Art Dateiserver, aber sie ist kein typischer Dateiserver. Was das Subversion Projektarchiv so speziell macht, ist, dass diese jede je gemachte Änderung speichert: jede Änderung an einer Datei, sogar Änderungen am Dateibaum selbst wie das Hinzufügen, Löschen oder Umbenennen/Verschieben von Dateien und Ordnern." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgstr "Warum ist dies so interessant? Bis jetzt klingt dies alles wie die Definition eines typischen Dateiservers. Und tatsächlich ist das Projektarchiv eine Art Dateiserver, aber sie ist kein typischer Dateiserver. Was das Git Projektarchiv so speziell macht, ist, dass diese jede je gemachte Änderung speichert: jede Änderung an einer Datei, sogar Änderungen am Dateibaum selbst wie das Hinzufügen, Löschen oder Umbenennen/Verschieben von Dateien und Ordnern." #. (para) #: ../source/TortoiseGit_en.xml:780 @@ -804,8 +804,8 @@ msgstr "Die Kopieren-Ändern-Zusammenführen Lösung" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." -msgstr "Subversion, CVS und andere Versionskontrollsysteme nutzen ein Kopieren-Ändern-Zusammenführen Modell als Alternative zur Sperrlösung. In diesem Modell hat jeder Benutzer eine persönliche Arbeitskopie des Projekts. Die Benutzer arbeiten dann parallel und ändern jeweils ihre persönliche Arbeitskopie. Schließlich werden diese privaten Arbeitskopien zu einer endgültigen Version zusammengeführt. Das Versionskontrollsystem hilft beim Zusammenführen, überlässt die endgültige Kontrolle aber dem Benutzer selbst." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgstr "Git, CVS und andere Versionskontrollsysteme nutzen ein Kopieren-Ändern-Zusammenführen Modell als Alternative zur Sperrlösung. In diesem Modell hat jeder Benutzer eine persönliche Arbeitskopie des Projekts. Die Benutzer arbeiten dann parallel und ändern jeweils ihre persönliche Arbeitskopie. Schließlich werden diese privaten Arbeitskopien zu einer endgültigen Version zusammengeführt. Das Versionskontrollsystem hilft beim Zusammenführen, überlässt die endgültige Kontrolle aber dem Benutzer selbst." #. (para) #: ../source/TortoiseGit_en.xml:907 @@ -842,22 +842,22 @@ msgstr "Schlussendlich hängt alles von einem einzigen kritischen Faktor ab: Kom #. (para) #: ../source/TortoiseGit_en.xml:966 msgid "There is one common situation where the lock-modify-unlock model comes out better, and that is where you have unmergeable files. For example if your repository contains some graphic images, and two people change the image at the same time, there is no way for those changes to be merged together. Either Harry or Sally will lose their changes." -msgstr "Es gibt eine Situation, in der das Sperren-Ändern-Freigeben Modell Vorteile bietet. Das ist bei Dateien der Fall, die sich nicht automatisch zusammenführen lassen. Wenn Ihr Projektarchiv zum Beispiel Grafiken enthält und zwei Personen gleichzeitig dieselbe Grafik ändern, kann Subversion nicht entscheiden, wie die Änderungen zusammengeführt werden. Entweder Harry oder Sally wird seine Änderungen verlieren." +msgstr "Es gibt eine Situation, in der das Sperren-Ändern-Freigeben Modell Vorteile bietet. Das ist bei Dateien der Fall, die sich nicht automatisch zusammenführen lassen. Wenn Ihr Projektarchiv zum Beispiel Grafiken enthält und zwei Personen gleichzeitig dieselbe Grafik ändern, kann Git nicht entscheiden, wie die Änderungen zusammengeführt werden. Entweder Harry oder Sally wird seine Änderungen verlieren." #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" -msgstr "Was macht Subversion?" +msgid "What does Git Do?" +msgstr "Was macht Git?" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." -msgstr "Subversion verwendet standardmäßig das Kopieren-Ändern-Zusammenführen Modell, und in den meisten Fällen wird das alles sein, was Sie jemals benötigen werden. Mit der Einführung von Version 1.2 unterstützt Subversion auch das Sperren von Dateien, so dass Ihnen diese Möglichkeit ebenfalls zur Verfügung steht." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." +msgstr "Git verwendet standardmäßig das Kopieren-Ändern-Zusammenführen Modell, und in den meisten Fällen wird das alles sein, was Sie jemals benötigen werden. Mit der Einführung von Version 1.2 unterstützt Git auch das Sperren von Dateien, so dass Ihnen diese Möglichkeit ebenfalls zur Verfügung steht." #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" -msgstr "Subversion bei der Arbeit" +msgid "Git in Action" +msgstr "Git bei der Arbeit" #. (title) #: ../source/TortoiseGit_en.xml:991 @@ -871,28 +871,28 @@ msgstr "Arbeitskopie" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." -msgstr "Sie haben bereits über Arbeitskopien gelesen; nun werden wir zeigen, wie Subversion diese erstellt und benutzt." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." +msgstr "Sie haben bereits über Arbeitskopien gelesen; nun werden wir zeigen, wie Git diese erstellt und benutzt." #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." -msgstr "Eine Subversion-Arbeitskopie ist eine ganz normale Ordnerstruktur auf einem lokalen Dateisystem, welches eine Anzahl von Dateien enthält. Sie können diese Dateien ändern wie Sie wollen, und falls dies Quellcode-Dateien sind, können Sie diese kompilieren wie sonst auch. Ihre Arbeitskopie ist Ihr eigenes privates Arbeitsfeld: Subversion wird nie Änderungen von anderen einfügen oder Ihre Änderungen anderen zur Verfügung stellen, ohne dass Sie Subversion explizit dazu auffordern." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgstr "Eine Git-Arbeitskopie ist eine ganz normale Ordnerstruktur auf einem lokalen Dateisystem, welches eine Anzahl von Dateien enthält. Sie können diese Dateien ändern wie Sie wollen, und falls dies Quellcode-Dateien sind, können Sie diese kompilieren wie sonst auch. Ihre Arbeitskopie ist Ihr eigenes privates Arbeitsfeld: Git wird nie Änderungen von anderen einfügen oder Ihre Änderungen anderen zur Verfügung stellen, ohne dass Sie Git explizit dazu auffordern." #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." -msgstr "Nachdem Sie einige Änderungen an den Dateien in Ihrer Arbeitskopie vorgenommen haben und Sie überprüft haben, dass diese immer noch korrekt funktionieren (z. B. ohne Fehler kompilierbar sind), stellt Ihnen Subversion Befehle zur Verfügung, um Ihre Änderungen zu publizieren (durch Speichern im zentralen Projektarchiv), d. h., anderen zur Verfügung zu stellen. Falls andere Benutzer ihre Änderungen veröffentlicht haben, stellt Subversion Befehle zur Verfügung, mit denen Sie diese Änderungen in Ihre Arbeitskopie einfügen können (durch Lesen aus dem zentralen Projektarchiv)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgstr "Nachdem Sie einige Änderungen an den Dateien in Ihrer Arbeitskopie vorgenommen haben und Sie überprüft haben, dass diese immer noch korrekt funktionieren (z. B. ohne Fehler kompilierbar sind), stellt Ihnen Git Befehle zur Verfügung, um Ihre Änderungen zu publizieren (durch Speichern im zentralen Projektarchiv), d. h., anderen zur Verfügung zu stellen. Falls andere Benutzer ihre Änderungen veröffentlicht haben, stellt Git Befehle zur Verfügung, mit denen Sie diese Änderungen in Ihre Arbeitskopie einfügen können (durch Lesen aus dem zentralen Projektarchiv)." #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." -msgstr "Eine Arbeitskopie enthält immer auch zusätzliche Dateien, erstellt und verwaltet von Subversion, um diese Befehle ausführen zu können. Genauer gesagt enthält jeder Ordner in Ihrer Arbeitskopie einen Unterordner mit Namen .svn, auch bekannt als der Administrative Ordner der Arbeitskopie. Die Dateien in jedem administrativen Ordner helfen Subversion dabei zu erkennen, welche Dateien Sie verändert haben und welche Dateien sich im Projektarchiv durch andere Benutzer geändert haben." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgstr "Eine Arbeitskopie enthält immer auch zusätzliche Dateien, erstellt und verwaltet von Git, um diese Befehle ausführen zu können. Genauer gesagt enthält jeder Ordner in Ihrer Arbeitskopie einen Unterordner mit Namen .svn, auch bekannt als der Administrative Ordner der Arbeitskopie. Die Dateien in jedem administrativen Ordner helfen Git dabei zu erkennen, welche Dateien Sie verändert haben und welche Dateien sich im Projektarchiv durch andere Benutzer geändert haben." #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." -msgstr "Ein typisches Subversion Projektarchiv enthält oft Dateien (oder Quellcode) von mehreren Projekten; normalerweise ist jedes Projekt ein Unterordner im Dateibaum. In einem solchen Umfeld enthält eine Arbeitskopie normalerweise nur einen solchen Unterordner des Projektarchivs." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgstr "Ein typisches Git Projektarchiv enthält oft Dateien (oder Quellcode) von mehreren Projekten; normalerweise ist jedes Projekt ein Unterordner im Dateibaum. In einem solchen Umfeld enthält eine Arbeitskopie normalerweise nur einen solchen Unterordner des Projektarchivs." #. (para) #: ../source/TortoiseGit_en.xml:1038 @@ -916,12 +916,12 @@ msgstr "Um eine Arbeitskopie zu erhalten, müssen Sie einen dieser Unterordner a #. (para) #: ../source/TortoiseGit_en.xml:1058 -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." -msgstr "Angenommen, Sie machen Änderungen an der Datei button.c. Da der .svn Ordner den Originalinhalt und das Änderungsdatum gespeichert hat, kann Subversion feststellen, dass Sie diese Datei geändert haben. Jedoch wird Subversion diese Änderungen erst veröffentlichen, wenn Sie Subversion dazu explizit auffordern. Der Vorgang des Veröffentlichens ist allgemein unter dem Begriff Übertragen (engl. committing) bekannt." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgstr "Angenommen, Sie machen Änderungen an der Datei button.c. Da der .svn Ordner den Originalinhalt und das Änderungsdatum gespeichert hat, kann Git feststellen, dass Sie diese Datei geändert haben. Jedoch wird Git diese Änderungen erst veröffentlichen, wenn Sie Git dazu explizit auffordern. Der Vorgang des Veröffentlichens ist allgemein unter dem Begriff Übertragen (engl. committing) bekannt." #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." +msgid "To publish your changes to others, you can use Git's commit command." msgstr "Um Ihre Änderungen anderen zur Verfügung zu stellen, verwenden Sie den Befehl Übertragen." #. (para) @@ -931,18 +931,18 @@ msgstr "Danach sind Ihre Änderungen an der Datei button.c #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." -msgstr "Nehmen Sie an, Sie haben eine Mitarbeiterin, Sally, die eine Arbeitskopie von /calc zur selben Zeit wie Sie ausgecheckt hat. Wenn Sie Ihre Änderungen übertragen, bleibt die Arbeitskopie von Sally unverändert. Subversion ändert an einer Arbeitskopie nur dann etwas, wenn Sie es ausdrücklich dazu auffordern." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." +msgstr "Nehmen Sie an, Sie haben eine Mitarbeiterin, Sally, die eine Arbeitskopie von /calc zur selben Zeit wie Sie ausgecheckt hat. Wenn Sie Ihre Änderungen übertragen, bleibt die Arbeitskopie von Sally unverändert. Git ändert an einer Arbeitskopie nur dann etwas, wenn Sie es ausdrücklich dazu auffordern." #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." -msgstr "Um ihre Arbeitskopie auf den neuesten Stand zu bringen, sagt Sally Subversion, dass es ihre Arbeitskopie aktualisieren soll mittels des Aktualisieren Befehls. Dies wird Ihre Änderungen in die Arbeitskopie von Sally einfügen, sowie natürlich alle weiteren Änderungen, welche andere vorgenommen haben seit Sally ihre Arbeitskopie das letzte mal aktualisiert hat." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgstr "Um ihre Arbeitskopie auf den neuesten Stand zu bringen, sagt Sally Git, dass es ihre Arbeitskopie aktualisieren soll mittels des Aktualisieren Befehls. Dies wird Ihre Änderungen in die Arbeitskopie von Sally einfügen, sowie natürlich alle weiteren Änderungen, welche andere vorgenommen haben seit Sally ihre Arbeitskopie das letzte mal aktualisiert hat." #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." -msgstr "Beachten Sie, dass Sally nicht angeben muss, welche Dateien genau Subversion aktualisieren soll; Subversion nutzt die Informationen im .svn Ordner und weitere Informationen aus dem Projektarchiv, um dies selbst festzustellen." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgstr "Beachten Sie, dass Sally nicht angeben muss, welche Dateien genau Git aktualisieren soll; Git nutzt die Informationen im .svn Ordner und weitere Informationen aus dem Projektarchiv, um dies selbst festzustellen." #. (title) #: ../source/TortoiseGit_en.xml:1103 @@ -951,8 +951,8 @@ msgstr "Projektarchiv URLs" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" -msgstr "Auf Subversion Projektarchive kann mittels vieler verschiedener Methoden zugegriffen werden - lokal oder durch verschiedene Netzwerk-Protokolle. Auf ein Objekt im Projektarchiv wird immer über eine URL zugegriffen. Das URL Schema zeigt die Zugriffsmethode:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgstr "Auf Git Projektarchive kann mittels vieler verschiedener Methoden zugegriffen werden - lokal oder durch verschiedene Netzwerk-Protokolle. Auf ein Objekt im Projektarchiv wird immer über eine URL zugegriffen. Das URL Schema zeigt die Zugriffsmethode:" #. (title) #: ../source/TortoiseGit_en.xml:1112 @@ -988,8 +988,8 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "Zugriff via WebDAV Protokoll auf einen Apache-Server, auf dem Subversion installiert ist." +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "Zugriff via WebDAV Protokoll auf einen Apache-Server, auf dem Git installiert ist." #. (literal) #: ../source/TortoiseGit_en.xml:1141 @@ -1034,8 +1034,8 @@ msgstr "Authentifizierter, verschlüsselter TCP/IP Zugriff mittels eigenem Proto #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." -msgstr "In den weitaus meisten Fällen nutzen Subversion URLs die Standardsyntax und erlauben, dass Servernamen und Portnummern als Teil der URL angegeben werden. Beachten Sie jedoch, dass die file:// Zugriffsmethode normalerweise nur für den Zugriff auf lokale Projektarchive verwendet wird, obwohl auch mittels eines UNC Pfades auf ein Projektarchiv im Netzwerk zugegriffen werden kann. In diesem Fall nimmt die URL die Form file://rechnername/pfad/zum/projektarchiv an. Bei einem lokalen Projektarchiv muss der Rechnername entweder leer oder localhost sein. Deshalb enthalten lokale Pfade meistens drei Schrägstriche, file:///pfad/zum/projektarchiv." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgstr "In den weitaus meisten Fällen nutzen Git URLs die Standardsyntax und erlauben, dass Servernamen und Portnummern als Teil der URL angegeben werden. Beachten Sie jedoch, dass die file:// Zugriffsmethode normalerweise nur für den Zugriff auf lokale Projektarchive verwendet wird, obwohl auch mittels eines UNC Pfades auf ein Projektarchiv im Netzwerk zugegriffen werden kann. In diesem Fall nimmt die URL die Form file://rechnername/pfad/zum/projektarchiv an. Bei einem lokalen Projektarchiv muss der Rechnername entweder leer oder localhost sein. Deshalb enthalten lokale Pfade meistens drei Schrägstriche, file:///pfad/zum/projektarchiv." #. (para) #: ../source/TortoiseGit_en.xml:1181 @@ -1094,8 +1094,8 @@ msgstr "Ein Übertragen Befehl kann Änderungen an beliebig v #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." -msgstr "Im Projektarchiv wird jede Übertragung als eine einzige atomare Transaktion behandelt: entweder werden alle Änderungen abgespeichert oder gar keine. Subversion stellt dies sogar im Falle von Systemabstürzen, Netzwerkproblemen, Stromausfällen oder anderen Problemen sicher." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgstr "Im Projektarchiv wird jede Übertragung als eine einzige atomare Transaktion behandelt: entweder werden alle Änderungen abgespeichert oder gar keine. Git stellt dies sogar im Falle von Systemabstürzen, Netzwerkproblemen, Stromausfällen oder anderen Problemen sicher." #. (para) #: ../source/TortoiseGit_en.xml:1238 @@ -1114,8 +1114,8 @@ msgstr "Globale Revisionsnummern" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" -msgstr "Anders als in vielen bekannten Versionskontrollsystemen stellt eine Revisionsnummer den Zustand eines ganzen Dateibaumes dar, nicht nur von einzelnen Dateien. Jede Revision ist ein ganzer Dateibaum, ein bestimmter Zustand des Projektarchivs nach einer Übertragung. Eine andere Möglichkeit, sich eine Revision vorzustellen, ist, dass eine Revision N den Zustand des Projektarchivs nach der N-ten Übertragung darstellt. Wenn ein Subversion-Benutzer von Revision 5 der Datei foo.c spricht, meint er in Wirklichkeit den Zustand der Datei foo.c wie sie in Revision 5 ausgesehen hat. Beachten Sie, dass zwei verschiedene Revisionen einer Datei nicht unterschiedlich sein müssen!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgstr "Anders als in vielen bekannten Versionskontrollsystemen stellt eine Revisionsnummer den Zustand eines ganzen Dateibaumes dar, nicht nur von einzelnen Dateien. Jede Revision ist ein ganzer Dateibaum, ein bestimmter Zustand des Projektarchivs nach einer Übertragung. Eine andere Möglichkeit, sich eine Revision vorzustellen, ist, dass eine Revision N den Zustand des Projektarchivs nach der N-ten Übertragung darstellt. Wenn ein Git-Benutzer von Revision 5 der Datei foo.c spricht, meint er in Wirklichkeit den Zustand der Datei foo.c wie sie in Revision 5 ausgesehen hat. Beachten Sie, dass zwei verschiedene Revisionen einer Datei nicht unterschiedlich sein müssen!" #. (para) #: ../source/TortoiseGit_en.xml:1276 @@ -1176,8 +1176,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." -msgstr "Sallys Änderungen an der Datei integer.c werden in Ihre Arbeitskopie eingefügt, und Ihre Änderungen in der Datei button.c werden immer noch vorhanden sein. In diesem Beispiel ist der Inhalt der Datei Makefile identisch in den Revisionen 4, 5 und 6, aber Subversion markiert Ihre lokale Kopie von Makefile mit Revision 6 um zu zeigen, dass diese immer noch aktuell ist. Also nachdem Sie eine saubere Aktualisierung durchgeführt haben, wird Ihre Arbeitskopie exakt einer Revision im Projektarchiv entsprechen." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgstr "Sallys Änderungen an der Datei integer.c werden in Ihre Arbeitskopie eingefügt, und Ihre Änderungen in der Datei button.c werden immer noch vorhanden sein. In diesem Beispiel ist der Inhalt der Datei Makefile identisch in den Revisionen 4, 5 und 6, aber Git markiert Ihre lokale Kopie von Makefile mit Revision 6 um zu zeigen, dass diese immer noch aktuell ist. Also nachdem Sie eine saubere Aktualisierung durchgeführt haben, wird Ihre Arbeitskopie exakt einer Revision im Projektarchiv entsprechen." #. (title) #: ../source/TortoiseGit_en.xml:1325 @@ -1186,8 +1186,8 @@ msgstr "Wie Arbeitskopien das Projektarchiv verfolgen" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" -msgstr "Für jede Datei in einer Arbeitskopie zeichnet Subversion zwei wesentliche Informationen im .svn Administrationsordner auf:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" +msgstr "Für jede Datei in einer Arbeitskopie zeichnet Git zwei wesentliche Informationen im .svn Administrationsordner auf:" #. (para) #: ../source/TortoiseGit_en.xml:1332 @@ -1201,8 +1201,8 @@ msgstr "Der Zeitpunkt, an dem die Datei zum letzten Mal aus dem Projektarchiv ak #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" -msgstr "Mittels dieser Informationen ist Subversion in der Lage, durch Anfragen an das Projektarchiv herauszufinden, in welchem der folgenden vier Zustände eine Datei ist:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" +msgstr "Mittels dieser Informationen ist Git in der Lage, durch Anfragen an das Projektarchiv herauszufinden, in welchem der folgenden vier Zustände eine Datei ist:" #. (term) #: ../source/TortoiseGit_en.xml:1352 @@ -1241,8 +1241,8 @@ msgstr "Lokal verändert und nicht aktuell" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." -msgstr "Die Datei wurde lokal und im Projektarchiv verändert. Ein Übertragen wird mit einer nicht mehr aktuell Fehlermeldung fehlschlagen. Sie müssen die Datei zuerst Aktualisieren, um die Änderungen aus dem Projektarchiv in die lokale Kopie einzufügen. Falls Subversion nicht in der Lage sein sollte, diese Änderungen selbst zusammenzuführen, was selten der Fall ist, muss der Benutzer den Konflikt manuell lösen." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgstr "Die Datei wurde lokal und im Projektarchiv verändert. Ein Übertragen wird mit einer nicht mehr aktuell Fehlermeldung fehlschlagen. Sie müssen die Datei zuerst Aktualisieren, um die Änderungen aus dem Projektarchiv in die lokale Kopie einzufügen. Falls Git nicht in der Lage sein sollte, diese Änderungen selbst zusammenzuführen, was selten der Fall ist, muss der Benutzer den Konflikt manuell lösen." #. (title) #: ../source/TortoiseGit_en.xml:1412 @@ -1251,8 +1251,8 @@ msgstr "Zusammenfassung" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "Wir haben eine Anzahl von grundlegenden Subversion-Konzepten in diesem Kapitel behandelt:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" +msgstr "Wir haben eine Anzahl von grundlegenden Git-Konzepten in diesem Kapitel behandelt:" #. (para) #: ../source/TortoiseGit_en.xml:1419 @@ -1261,13 +1261,13 @@ msgstr "Wir haben den Begriff des zentralen Projektarchivs, der Arbeitskopie und #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." -msgstr "Wir haben einige einfache Beispiele gezeigt, wie zwei Mitarbeiter Subversion mittels des Kopieren-Ändern-Zusammenführen Modells benutzen können, um Änderungen zur Verfügung zu stellen und Änderungen von anderen zu übernehmen." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgstr "Wir haben einige einfache Beispiele gezeigt, wie zwei Mitarbeiter Git mittels des Kopieren-Ändern-Zusammenführen Modells benutzen können, um Änderungen zur Verfügung zu stellen und Änderungen von anderen zu übernehmen." #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." -msgstr "Wir sprachen ein wenig darüber, wie Subversion Informationen in der Arbeitskopie verfolgt und verwaltet." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." +msgstr "Wir sprachen ein wenig darüber, wie Git Informationen in der Arbeitskopie verfolgt und verwaltet." #. (title) #: ../source/TortoiseGit_en.xml:1445 @@ -1276,13 +1276,13 @@ msgstr "Einen Server einrichten" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." -msgstr "Um TortoiseGit (oder einen anderen Subversion Client) nutzen zu können, benötigen Sie einen Ort, an dem Ihre Projektarchive liegen. Sie können diese entweder lokal anlegen und mit dem file:// Protokoll darauf zugreifen oder Sie können die Projektarchive auf einem Server anlegen und mit den http:// oder svn:// Protokollen darauf zugreifen. Die beiden Serverprotokolle können zusätzlich verschlüsselt werden. Dazu verwenden Sie entweder https:// oder svn+ssh://. Diese Kapitel zeigt Ihnen Schritt für Schritt, wie Sie einen Server auf einem Windows Rechner einrichten." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgstr "Um TortoiseGit (oder einen anderen Git Client) nutzen zu können, benötigen Sie einen Ort, an dem Ihre Projektarchive liegen. Sie können diese entweder lokal anlegen und mit dem file:// Protokoll darauf zugreifen oder Sie können die Projektarchive auf einem Server anlegen und mit den http:// oder svn:// Protokollen darauf zugreifen. Die beiden Serverprotokolle können zusätzlich verschlüsselt werden. Dazu verwenden Sie entweder https:// oder svn+ssh://. Diese Kapitel zeigt Ihnen Schritt für Schritt, wie Sie einen Server auf einem Windows Rechner einrichten." #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." -msgstr "Detaillierte Informationen über Subversion Serveroptionen und wie Sie die beste Architektur für Ihre Situation wählen, finden Sie in Server Configuration." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." +msgstr "Detaillierte Informationen über Git Serveroptionen und wie Sie die beste Architektur für Ihre Situation wählen, finden Sie in Server Configuration." #. (para) #: ../source/TortoiseGit_en.xml:1466 @@ -1306,8 +1306,8 @@ msgstr "Apache" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" -msgstr "Der vielseitigste aller Server für Subversion ist der auf Apache basierende Server. Obwohl er ein wenig schwieriger einzurichten ist, bietet er den anderen Varianten gegenüber einige Vorteile:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgstr "Der vielseitigste aller Server für Git ist der auf Apache basierende Server. Obwohl er ein wenig schwieriger einzurichten ist, bietet er den anderen Varianten gegenüber einige Vorteile:" #. (primary) #. (term) @@ -1318,8 +1318,8 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." -msgstr "Der Apache-basierte Subversion Server nutzt das WebDAV Protokoll, das auch von vielen anderen Programmen unterstützt wird. Sie können ein solches Verzeichnis zum Beispiel als Web-Ordner im Windows Explorer einbinden und wie jeden anderen Ordner im Dateisystem benutzen." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgstr "Der Apache-basierte Git Server nutzt das WebDAV Protokoll, das auch von vielen anderen Programmen unterstützt wird. Sie können ein solches Verzeichnis zum Beispiel als Web-Ordner im Windows Explorer einbinden und wie jeden anderen Ordner im Dateisystem benutzen." #. (term) #: ../source/TortoiseGit_en.xml:1509 @@ -1328,8 +1328,8 @@ msgstr "Das Projektarchiv betrachten" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." -msgstr "Sie können Ihren Web-Browser per http:// auf die URL des Projektarchivs zeigen lassen und dessen Inhalt betrachten, ohne einen Subversion Client zu installieren. Dies ermöglicht einem großen Anwenderkreis auf Ihre Daten zuzugreifen." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." +msgstr "Sie können Ihren Web-Browser per http:// auf die URL des Projektarchivs zeigen lassen und dessen Inhalt betrachten, ohne einen Git Client zu installieren. Dies ermöglicht einem großen Anwenderkreis auf Ihre Daten zuzugreifen." #. (term) #. (title) @@ -1366,7 +1366,7 @@ msgstr "Bitte beachten Sie, dass Windows XP ohne Servicepack 1 zu fehlerhaften N #. (para) #: ../source/TortoiseGit_en.xml:1555 msgid "Download the latest version of the Apache web server from http://httpd.apache.org/download.cgi. Make sure that you download the version 2.2.x - the version 1.3.xx won't work!" -msgstr "Laden Sie die neueste Version des Apache Web-Servers von http://httpd.apache.org/download.cgi. Achten Sie darauf, dass Sie Version 2.2.x oder neuer herunterladen - Die 1.3.xx arbeiten nicht mit Subversion zusammen!" +msgstr "Laden Sie die neueste Version des Apache Web-Servers von http://httpd.apache.org/download.cgi. Achten Sie darauf, dass Sie Version 2.2.x oder neuer herunterladen - Die 1.3.xx arbeiten nicht mit Git zusammen!" #. (para) #: ../source/TortoiseGit_en.xml:1564 @@ -1410,18 +1410,18 @@ msgstr "Für die Installation von Apache unter Windows benötigen Sie zumindest #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Subversion installieren" +msgid "Installing Git" +msgstr "Git installieren" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Laden Sie die neuste Version von Subversion für Apache unter Win32 herunter. Stellen Sie sicher, dass sie die richtige Version für Ihren Apachen wählen, da Sie sonst seltsame Fehlermeldungen beim Neustart erhalten. Für Apache Version 2.2.x gehen Sie zu http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Laden Sie die neuste Version von Git für Apache unter Win32 herunter. Stellen Sie sicher, dass sie die richtige Version für Ihren Apachen wählen, da Sie sonst seltsame Fehlermeldungen beim Neustart erhalten. Für Apache Version 2.2.x gehen Sie zu http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." -msgstr "Starten Sie den Subversion-Installer und folgen Sie den Anweisungen. Wenn der Subversion-Installer bemerkt, dass Sie Apache installiert haben, haben Sie es fast geschafft. Wenn er keinen Apache-Server finden konnte, müssen Sie einige zusätzliche Schritte durchführen." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgstr "Starten Sie den Git-Installer und folgen Sie den Anweisungen. Wenn der Git-Installer bemerkt, dass Sie Apache installiert haben, haben Sie es fast geschafft. Wenn er keinen Apache-Server finden konnte, müssen Sie einige zusätzliche Schritte durchführen." #. (primary) #. (primary) @@ -1432,13 +1432,13 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "Gehen Sie mit dem Windows Explorer ins Installationsverzeichnis von Subversion (für gewöhnlich c:\\Programme\\Subversion) und finden Sie die Dateien /httpd/mod_dav_svn.so und mod_authz_svn.so. Kopieren Sie diese Dateien ins Apache-Modulverzeichnis (für gewöhnlich c:\\Programme\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "Gehen Sie mit dem Windows Explorer ins Installationsverzeichnis von Git (für gewöhnlich c:\\Programme\\Git) und finden Sie die Dateien /httpd/mod_dav_svn.so und mod_authz_svn.so. Kopieren Sie diese Dateien ins Apache-Modulverzeichnis (für gewöhnlich c:\\Programme\\apache group\\apache2\\modules )." #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." -msgstr "Kopieren Sie die Dateien /bin/libdb*.dll und /bin/intl3_svn.dll aus dem Subversion-Installationsverzeichnis in dass Apache /bin Verzeichnis." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." +msgstr "Kopieren Sie die Dateien /bin/libdb*.dll und /bin/intl3_svn.dll aus dem Git-Installationsverzeichnis in dass Apache /bin Verzeichnis." #. (para) #: ../source/TortoiseGit_en.xml:1677 @@ -1480,12 +1480,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "Am Ende der Konfigurationsdatei fügen Sie die folgenden Zeilen hinzu:\n" "<Location /svn>\n" @@ -1494,13 +1494,13 @@ msgstr "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion-Projektarchive\"\n" +" AuthName \"Git-Projektarchive\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" "\n" -"Dies konfiguriert Apache so, dass alle Ihre Subversion-Projektarchive physikalisch unterhalb von D:\\SVN liegen. Die Projektarchive werden der Außenwelt unter folgender URL zu Verfügung gestellt: http://MyServer/svn/. Der Zugriff ist auf bekannte Benutzer/Passwörter beschränkt, die in der passwd-Datei aufgelistet sind." +"Dies konfiguriert Apache so, dass alle Ihre Git-Projektarchive physikalisch unterhalb von D:\\SVN liegen. Die Projektarchive werden der Außenwelt unter folgender URL zu Verfügung gestellt: http://MyServer/svn/. Der Zugriff ist auf bekannte Benutzer/Passwörter beschränkt, die in der passwd-Datei aufgelistet sind." #. (para) #: ../source/TortoiseGit_en.xml:1740 @@ -1524,13 +1524,13 @@ msgstr "Starten Sie den Apache-Dienst noch einmal neu." #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "Öffnen Sie mit Ihrem Web-Browser die URL http://MeinServer/svn/MeinNeuesProjektarchiv (wobei MeinNeuesProjektarchiv der Name des Subversion-Projektarchivs ist, das Sie zuvor erstellt haben). Wenn alles gut gegangen ist, sollten Sie nach einem Benutzernamen und Passwort gefragt werden und können dann den Inhalt Ihres Projektarchivs sehen." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "Öffnen Sie mit Ihrem Web-Browser die URL http://MeinServer/svn/MeinNeuesProjektarchiv (wobei MeinNeuesProjektarchiv der Name des Git-Projektarchivs ist, das Sie zuvor erstellt haben). Wenn alles gut gegangen ist, sollten Sie nach einem Benutzernamen und Passwort gefragt werden und können dann den Inhalt Ihres Projektarchivs sehen." #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "Jetzt haben Sie Apache und Subversion eingerichtet, aber Apache weiß noch nicht, wie mit Subversion-Clients wie TortoiseGit umzugehen ist. Um Apache beizubringen, welche URL für Subversion-Projektarchive benutzt werden soll, müssen Sie die Apache-Konfigurationsdatei (für gewöhnlich platziert in c:\\Programme\\apache group\\apache2\\conf\\httpd.conf) mit einem beliebigen Texteditor (z.B. Notepad) bearbeiten: " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "Jetzt haben Sie Apache und Git eingerichtet, aber Apache weiß noch nicht, wie mit Git-Clients wie TortoiseGit umzugehen ist. Um Apache beizubringen, welche URL für Git-Projektarchive benutzt werden soll, müssen Sie die Apache-Konfigurationsdatei (für gewöhnlich platziert in c:\\Programme\\apache group\\apache2\\conf\\httpd.conf) mit einem beliebigen Texteditor (z.B. Notepad) bearbeiten: " #. (primary) #: ../source/TortoiseGit_en.xml:1777 @@ -1568,18 +1568,18 @@ msgstr "http://MyServer/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " +msgid "means that the Git repositories are available from the URL " msgstr "bedeutet, dass die Projektarchive unter der URL aufrufbar sind." #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "teilt Apache mit, welches Modul (in diesem Fall das Subversion Modul), für diese URL zuständig ist." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." +msgstr "teilt Apache mit, welches Modul (in diesem Fall das Git Modul), für diese URL zuständig ist." #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." -msgstr "Für Subversion 1.3 und neuer ermöglicht diese Direktive, die verfügbaren Projektarchive unter aufzulisten." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." +msgstr "Für Git 1.3 und neuer ermöglicht diese Direktive, die verfügbaren Projektarchive unter aufzulisten." #. (filename) #: ../source/TortoiseGit_en.xml:1822 @@ -1588,7 +1588,7 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " +msgid "tells Git to look for repositories below " msgstr "teilt Apache mit, dass die Projektarchive unterhalb von liegen." #. (entry) @@ -1613,8 +1613,8 @@ msgstr "gibt die Passwortdatei für die Anmeldung an." #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "Name der Datei in der die Zugriffsrechte innerhalb der Subversion Projektarchive festgelegt sind." +msgid "Location of the Access file for paths inside a Git repository" +msgstr "Name der Datei in der die Zugriffsrechte innerhalb der Git Projektarchive festgelegt sind." #. (entry) #: ../source/TortoiseGit_en.xml:1861 @@ -1646,10 +1646,10 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "Mit einer passwd Datei können Sie den Zugriff auf alle Ihre Projektarchive zentral steuern. Wenn Sie genau einstellen wollen, welche Benutzer / Gruppen welche Berechtigungen in Ihren Projektarchiven haben sollen, entfernen Sie das Kommentarzeichen vor\n" -"#AuthzSVNAccessFile svnaccessfile und legen Sie die Subversion Zugriffsdatei svnaccessfile an. Apache stellt sicher, dass nur angemeldete Benutzer auf Ihre /svn Location zugreifen können und wird dann den Benutzernamen an das Subversion AuthzSVNAccessFile Modul weiterreichen, das die Benutzerrechte fein gegliedert anhand der Regeln in der Subversion Zugriffsdatei steuert. Beachten Sie, dass die Pfade entweder als Projektarchiv:Pfad oder einfach als Pfad angegeben werden. Wenn Sie kein Projektarchiv angeben, wird die Regel auf alle Projektarchive unterhalb SVNParentPath angewendet. Das Format der von mod_authz_svn verwendeten Berechtigungsdatei ist in beschrieben." +"#AuthzSVNAccessFile svnaccessfile und legen Sie die Git Zugriffsdatei svnaccessfile an. Apache stellt sicher, dass nur angemeldete Benutzer auf Ihre /svn Location zugreifen können und wird dann den Benutzernamen an das Git AuthzSVNAccessFile Modul weiterreichen, das die Benutzerrechte fein gegliedert anhand der Regeln in der Git Zugriffsdatei steuert. Beachten Sie, dass die Pfade entweder als Projektarchiv:Pfad oder einfach als Pfad angegeben werden. Wenn Sie kein Projektarchiv angeben, wird die Regel auf alle Projektarchive unterhalb SVNParentPath angewendet. Das Format der von mod_authz_svn verwendeten Berechtigungsdatei ist in beschrieben." #. (para) #: ../source/TortoiseGit_en.xml:1915 @@ -1689,13 +1689,13 @@ msgstr "Index der Projekte" #. (para) #: ../source/TortoiseGit_en.xml:1955 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." -msgstr "Wenn Sie die SVNParentPath-Direktive benutzt haben, brauchen Sie die Apache-Konfigurationsdatei nicht jedes Mal zu ändern, wenn Sie ein neues Subversion-Projektarchiv erstellt haben. Erstellen Sie das neue Projektarchiv einfach an der gleichen Stelle wie das erste Projektarchiv und Sie sind fertig! In meiner Firma habe ich über SMB (normaler Windows-Dateizugriff) direkten Zugriff auf diesen speziellen Ordner auf dem Server. Also erstelle ich dort einfach einen neuen Ordner, führe den TortoiseGit-Befehl TortoiseGit Projektarchiv hier erstellen... aus und ein neues Projekt hat ein Zuhause..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgstr "Wenn Sie die SVNParentPath-Direktive benutzt haben, brauchen Sie die Apache-Konfigurationsdatei nicht jedes Mal zu ändern, wenn Sie ein neues Git-Projektarchiv erstellt haben. Erstellen Sie das neue Projektarchiv einfach an der gleichen Stelle wie das erste Projektarchiv und Sie sind fertig! In meiner Firma habe ich über SMB (normaler Windows-Dateizugriff) direkten Zugriff auf diesen speziellen Ordner auf dem Server. Also erstelle ich dort einfach einen neuen Ordner, führe den TortoiseGit-Befehl TortoiseGit Projektarchiv hier erstellen... aus und ein neues Projekt hat ein Zuhause..." #. (para) #: ../source/TortoiseGit_en.xml:1969 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." -msgstr "Wenn Sie Subversion 1.3 oder neuer benutzen, können Sie die SVNListParentPath on Direktive verwenden, damit Apache eine Liste aller verfügbaren Projekte erzeugt, falls Sie auf den SVNParentPath anstatt auf ein Projektarchiv zugreifen." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgstr "Wenn Sie Git 1.3 oder neuer benutzen, können Sie die SVNListParentPath on Direktive verwenden, damit Apache eine Liste aller verfügbaren Projekte erzeugt, falls Sie auf den SVNParentPath anstatt auf ein Projektarchiv zugreifen." #. (title) #: ../source/TortoiseGit_en.xml:1977 @@ -1709,8 +1709,8 @@ msgstr "Autorisierung" #. (para) #: ../source/TortoiseGit_en.xml:1984 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." -msgstr "Das mod_authz_svn Modul ermöglicht fein gegliederte Zugriffsberechtigungen basierend auf Benutzernamen und Pfaden im Projektarchiv. Diese Funktionen stehen seit jeher mit dem Apache Server und seit Subversion 1.3 auch mit svnserve zur Verfügung." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." +msgstr "Das mod_authz_svn Modul ermöglicht fein gegliederte Zugriffsberechtigungen basierend auf Benutzernamen und Pfaden im Projektarchiv. Diese Funktionen stehen seit jeher mit dem Apache Server und seit Git 1.3 auch mit svnserve zur Verfügung." #. (para) #: ../source/TortoiseGit_en.xml:1990 @@ -1849,7 +1849,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1863,7 +1863,7 @@ msgid "" "SSPIOfferBasic On\n" " within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" -"Damit die Subversion Location dieses Anmeldeverfahren verwendet, müssen Sie die Zeile\n" +"Damit die Git Location dieses Anmeldeverfahren verwendet, müssen Sie die Zeile\n" "AuthType Basic in\n" "AuthType SSPI ändern. Weiterhin müssen Sie die Zeilen:\n" "SSPIAuth On\n" @@ -1892,8 +1892,8 @@ msgstr "Eine Anleitung zum Einrichten von SSL auf Ihrem Server findet sich in AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." -msgstr "Subversion AuthzSVNAccessFile Dateien berücksichtigen bei Benutzernamen die Groß- / Kleinschreibung (JUser unterscheidet sich von juser)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgstr "Git AuthzSVNAccessFile Dateien berücksichtigen bei Benutzernamen die Groß- / Kleinschreibung (JUser unterscheidet sich von juser)." #. (para) #: ../source/TortoiseGit_en.xml:2145 @@ -1902,18 +1902,18 @@ msgstr "In der Microsoft Welt wird die Schreibweise bei Windows Domänen und Ben #. (para) #: ../source/TortoiseGit_en.xml:2150 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." -msgstr "Dieser Unterschied kann schmerzhaft sein, wenn Sie SSPI Anmeldung unter Windows verwenden und der Benutzername in der gleichen Schreibweise an Subversion weitergereicht wird, wie der Anwender ihn eingegeben hat, da JUser und juser für Subversion verschiedene Personen sind. Der Internet Explorer reicht den Anmeldenamen oft automatisch in der Schreibweise, in der das Konto angelegt wurde, an Apache weiter." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgstr "Dieser Unterschied kann schmerzhaft sein, wenn Sie SSPI Anmeldung unter Windows verwenden und der Benutzername in der gleichen Schreibweise an Git weitergereicht wird, wie der Anwender ihn eingegeben hat, da JUser und juser für Git verschiedene Personen sind. Der Internet Explorer reicht den Anmeldenamen oft automatisch in der Schreibweise, in der das Konto angelegt wurde, an Apache weiter." #. (para) #: ../source/TortoiseGit_en.xml:2158 msgid "The end result is that you may need at least two entries in your AuthzSVNAccessFile for each user -- a lowercase entry and an entry in the same case that Internet Explorer passes to Apache. You will also need to train your users to also type in their credentials using lower case when accessing repositories via TortoiseGit." -msgstr "Das Ergebnis davon ist, dass Sie für jeden Anwender mindestens zwei Einträge in Ihrer AuthzSVNAccessFile Datei benötigen. Einen Eintrag in Kleinbuchstaben und einen Eintrag in der Schreibweise wie das Konto angelegt wurde. Weiterhin müssen Sie Ihre Anwender dahingehend trainieren, dass sie sich immer in Kleinbuchstaben anmelden, wenn sie einen Subversion Client wie TortoiseGit benutzen." +msgstr "Das Ergebnis davon ist, dass Sie für jeden Anwender mindestens zwei Einträge in Ihrer AuthzSVNAccessFile Datei benötigen. Einen Eintrag in Kleinbuchstaben und einen Eintrag in der Schreibweise wie das Konto angelegt wurde. Weiterhin müssen Sie Ihre Anwender dahingehend trainieren, dass sie sich immer in Kleinbuchstaben anmelden, wenn sie einen Git Client wie TortoiseGit benutzen." #. (para) #: ../source/TortoiseGit_en.xml:2166 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." -msgstr "Die Fehler- und Zugriffs-Logdateien von Apache sind Ihre besten Freunde, wenn es darum geht, Probleme dieser Art zu lokalisieren und zu beseitigen, da Sie Ihnen anzeigen, in welcher Schreibweise ein Anmeldename an das Subversion AuthzSVNAccessFile Modul weitergereicht wurde. Sie müssen eventuell etwas mit dem exakten Format der Anmeldenamen in svnaccessfile experimentieren (z.B. DOMÄNE\\user und DOMÄNE//user), um alles ans Laufen zu bekommen." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgstr "Die Fehler- und Zugriffs-Logdateien von Apache sind Ihre besten Freunde, wenn es darum geht, Probleme dieser Art zu lokalisieren und zu beseitigen, da Sie Ihnen anzeigen, in welcher Schreibweise ein Anmeldename an das Git AuthzSVNAccessFile Modul weitergereicht wurde. Sie müssen eventuell etwas mit dem exakten Format der Anmeldenamen in svnaccessfile experimentieren (z.B. DOMÄNE\\user und DOMÄNE//user), um alles ans Laufen zu bekommen." #. (title) #: ../source/TortoiseGit_en.xml:2180 @@ -1927,8 +1927,8 @@ msgstr "Mehrfachanmeldung" #. (para) #: ../source/TortoiseGit_en.xml:2184 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." -msgstr "Es ist auch möglich, mehr als eine Anmeldequelle für Ihr Subversion Projektarchiv zu haben. Um dies zu erreichen, müssen Sie jeden Anmeldetyp als unmaßgeblich (non-authoritative) festlegen, so dass Apache mehrere Quellen auf eine korrekte Name/Passwort Kombination überprüft." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgstr "Es ist auch möglich, mehr als eine Anmeldequelle für Ihr Git Projektarchiv zu haben. Um dies zu erreichen, müssen Sie jeden Anmeldetyp als unmaßgeblich (non-authoritative) festlegen, so dass Apache mehrere Quellen auf eine korrekte Name/Passwort Kombination überprüft." #. (para) #: ../source/TortoiseGit_en.xml:2190 @@ -1957,7 +1957,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1982,7 +1982,7 @@ msgstr "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2107,13 +2107,13 @@ msgstr "SSL und Internet Explorer" #. (para) #: ../source/TortoiseGit_en.xml:2339 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." -msgstr "Wenn Sie Ihren Server mit SSL sichern und sich über eine Windows Domäne anmelden, werden Sie feststellen, dass die Anzeige des Projektarchivs im Internet Explorer nicht mehr funktioniert. Das liegt daran, dass sich der Internet Explorer nicht mehr anmelden kann. Andere Web-Browser haben dieses Problem nicht und sowohl TortoiseGit als auch andere Subversion Clients können sich problemlos anmelden." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." +msgstr "Wenn Sie Ihren Server mit SSL sichern und sich über eine Windows Domäne anmelden, werden Sie feststellen, dass die Anzeige des Projektarchivs im Internet Explorer nicht mehr funktioniert. Das liegt daran, dass sich der Internet Explorer nicht mehr anmelden kann. Andere Web-Browser haben dieses Problem nicht und sowohl TortoiseGit als auch andere Git Clients können sich problemlos anmelden." #. (para) #: ../source/TortoiseGit_en.xml:2353 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." -msgstr "Einen separaten <Location /path> Block in der Apache Konfigurationsdatei definieren und den Eintrag SSPIBasicPreferred On hinzufügen. Dies ermöglicht IE die Anmeldung wieder, aber andere Web-Browser und Subversion können sich an dieser Location nicht anmelden." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." +msgstr "Einen separaten <Location /path> Block in der Apache Konfigurationsdatei definieren und den Eintrag SSPIBasicPreferred On hinzufügen. Dies ermöglicht IE die Anmeldung wieder, aber andere Web-Browser und Git können sich an dieser Location nicht anmelden." #. (para) #: ../source/TortoiseGit_en.xml:2363 @@ -2148,8 +2148,8 @@ msgstr "SSL Zugriff erzwingen" #. (para) #: ../source/TortoiseGit_en.xml:2395 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." -msgstr "Wenn Sie SSL eingerichtet haben, um Ihr Projektarchiv abzusichern, möchten Sie vielleicht den normalen, unverschlüsselten http:// Zugriff sperren und nur https:// zulassen. Dafür müssen Sie zusätzlich die Anweisung SSLRequireSSL in den Subversion <Location> Block einfügen." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." +msgstr "Wenn Sie SSL eingerichtet haben, um Ihr Projektarchiv abzusichern, möchten Sie vielleicht den normalen, unverschlüsselten http:// Zugriff sperren und nur https:// zulassen. Dafür müssen Sie zusätzlich die Anweisung SSLRequireSSL in den Git <Location> Block einfügen." #. (para) #: ../source/TortoiseGit_en.xml:2402 @@ -2160,7 +2160,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2173,7 +2173,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion Projektarchive\"\n" +" AuthName \"Git Projektarchive\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2192,8 +2192,8 @@ msgstr "Danke an Nigel Green für diesen Beitrag an die TortoiseGit Mailingliste #. (para) #: ../source/TortoiseGit_en.xml:2424 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." -msgstr "In manchen Serverkonfigurationen müssen Sie einen einzelnen Server mit zwei virtuellen Hosts einrichten: Den ersten für öffentlichen Web-Zugriff ohne Zertifikat, den zweiten, auf dem ein Subversion Server läuft, durch ein für den Client erforderliches Zertifikat abgesichert." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." +msgstr "In manchen Serverkonfigurationen müssen Sie einen einzelnen Server mit zwei virtuellen Hosts einrichten: Den ersten für öffentlichen Web-Zugriff ohne Zertifikat, den zweiten, auf dem ein Git Server läuft, durch ein für den Client erforderliches Zertifikat abgesichert." #. (para) #: ../source/TortoiseGit_en.xml:2430 @@ -2203,11 +2203,11 @@ msgstr "Durch das Hinzufügen einer SSLVerifyClient Optional #. (para) #: ../source/TortoiseGit_en.xml:2440 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" -"Die Lösung besteht darin, dem Virtual Host Verzeichnis, dass sie für Subversion absichern wollen, die folgende Anweisung hinzuzufügen: SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" +"Die Lösung besteht darin, dem Virtual Host Verzeichnis, dass sie für Git absichern wollen, die folgende Anweisung hinzuzufügen: SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" "\n" "Diese Anweisung ermöglicht nur dann den Zugriff auf das Verzeichnis, falls ein Client-Zertifikat empfangen und erfolgreich verifiziert wurde." @@ -2225,10 +2225,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2250,10 +2250,10 @@ msgstr "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual Host Konfiguration für SUBVERSION\n" +"### Virtual Host Konfiguration für Git\n" "### (ein Client-Zertifikat wird benötigt)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2271,8 +2271,8 @@ msgstr "Svnserve als Server" #. (para) #: ../source/TortoiseGit_en.xml:2485 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." -msgstr "Es kann Situationen geben, in denen es nicht möglich ist, Apache als Server einzusetzen. Glücklicherweise enthält Subversion svnserve, einen eigenständigen kleinen Server, der ein eigenes Protokoll auf einer Standard TCP/IP Verbindung nutzt." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgstr "Es kann Situationen geben, in denen es nicht möglich ist, Apache als Server einzusetzen. Glücklicherweise enthält Git svnserve, einen eigenständigen kleinen Server, der ein eigenes Protokoll auf einer Standard TCP/IP Verbindung nutzt." #. (para) #: ../source/TortoiseGit_en.xml:2491 @@ -2286,23 +2286,23 @@ msgstr "Svnserve installieren" #. (para) #: ../source/TortoiseGit_en.xml:2502 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." -msgstr "Laden Sie die neueste Subversion Version von http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 herunter. Alternativ können Sie sich ein Installationsprogramm von CollabNet unter http://www.collab.net/downloads/subversion herunterladen. Dieses Installationsprogramm richtet svnserve als Windows Dienst ein und enthält obendrein einige der Werkzeuge, die Sie zum Einrichten von SASL zur Absicherung des Servers benötigen." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgstr "Laden Sie die neueste Git Version von http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91 herunter. Alternativ können Sie sich ein Installationsprogramm von CollabNet unter http://www.collab.net/downloads/Git herunterladen. Dieses Installationsprogramm richtet svnserve als Windows Dienst ein und enthält obendrein einige der Werkzeuge, die Sie zum Einrichten von SASL zur Absicherung des Servers benötigen." #. (para) #: ../source/TortoiseGit_en.xml:2516 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." -msgstr "Wenn Sie bereits Subversion installiert haben und svnserve läuft, müssen Sie den Dienst stoppen, bevor Sie weitermachen" +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." +msgstr "Wenn Sie bereits Git installiert haben und svnserve läuft, müssen Sie den Dienst stoppen, bevor Sie weitermachen" #. (para) #: ../source/TortoiseGit_en.xml:2522 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." -msgstr "Starten Sie das Subversion Installationsprogramm. Wenn Sie die Installation auf Ihrem Server durchführen (empfohlen), können Sie Schritt 4 überspringen." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." +msgstr "Starten Sie das Git Installationsprogramm. Wenn Sie die Installation auf Ihrem Server durchführen (empfohlen), können Sie Schritt 4 überspringen." #. (para) #: ../source/TortoiseGit_en.xml:2528 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "Öffnen Sie das Installationsverzeichnis von Subversion im Windows Explorer. (normalerweise C:\\Programme\\Subversion). Aus dem bin Verzeichnis kopieren Sie die Dateien svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll und ssleay32.dll in das Verzeichnis in dem Ihr Server installiert ist z.B. c:\\svnserve." +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "Öffnen Sie das Installationsverzeichnis von Git im Windows Explorer. (normalerweise C:\\Programme\\Git). Aus dem bin Verzeichnis kopieren Sie die Dateien svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll und ssleay32.dll in das Verzeichnis in dem Ihr Server installiert ist z.B. c:\\svnserve." #. (title) #: ../source/TortoiseGit_en.xml:2550 @@ -2372,42 +2372,42 @@ msgstr "Svnserve als Dienst starten" #. (para) #: ../source/TortoiseGit_en.xml:2624 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." -msgstr "Es ist normalerweise nicht die beste Lösung, svnserve als Anwender laufen zu lassen. Das bedeutet nämlich, dass ständig ein Anwender an Ihrem Server angemeldet ist oder dass jemand svnserve versehentlich beenden beziehungsweise nach einem Neustart vergessen könnte den Prozess ebenfalls zu starten. Eine bessere Möglichkeit besteht darin, svnserve als Dienst zu starten. Beginnend mit Subversion 1.4 kann svnserve als Windows-Dienst gestartet werden, vorherige Versionen benötigen ein Zusatzprogramm." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." +msgstr "Es ist normalerweise nicht die beste Lösung, svnserve als Anwender laufen zu lassen. Das bedeutet nämlich, dass ständig ein Anwender an Ihrem Server angemeldet ist oder dass jemand svnserve versehentlich beenden beziehungsweise nach einem Neustart vergessen könnte den Prozess ebenfalls zu starten. Eine bessere Möglichkeit besteht darin, svnserve als Dienst zu starten. Beginnend mit Git 1.4 kann svnserve als Windows-Dienst gestartet werden, vorherige Versionen benötigen ein Zusatzprogramm." #. (para) #: ../source/TortoiseGit_en.xml:2631 msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Um svnserve als Dienst einzurichten, der gemeinsam mit Windows startet, führen Sie folgenden Befehl aus.\n" "sc create svnserve\n" " binpath= \"c:\\svnserve\\svnserve.exe --service --root c:\\repos\"\n" -" displayname= \"Subversion\"\n" +" displayname= \"Git\"\n" " depend= tcpip\n" " start= auto\n" "\n" "Die Eingabe des Befehls muss in einer einzigen Zeile erfolgen. Falls einer der Pfade Leerzeichen enthält, müssen Sie diesen folgendermaßen in Anführungszeichen einschließen\n" "sc create svnserve\n" -" binpath= \"\\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" +" binpath= \"\\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" " --service --root c:\\repos\"\n" -" displayname= \"Subversion\"\n" +" displayname= \"Git\"\n" " depend= tcpip\n" " start= auto\n" "\n" "Sie können auch nach dem Start des Dienstes eine Beschreibung angeben. Diese wird im Windows Dienstemanager angezeigt.\n" -"sc description svnserve \"Subversion server (svnserve)\"" +"sc description svnserve \"Git server (svnserve)\"" #. (para) #: ../source/TortoiseGit_en.xml:2654 @@ -2419,11 +2419,11 @@ msgstr "Beachten Sie bitte das eher unübliche Kommandozeilenformat von The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Microsoft empfiehlt mittlerweile, dass Dienste entweder unter dem lokale Dienste- oder dem Netzwerkdienstekonto ausgeführt werden. Lesen Sie mehr dazu unter The Services and Service Accounts Security Planning Guide. Um den Dienst unter dem lokalen Dienstekonto einzurichten, fügen Sie den folgenden Text an das obenstehende Beispiel an.\n" "obj=\"NT AUTHORITY\\LocalService\"\n" -"Beachten Sie, dass Sie dem lokalen Dienstekonto die entsprechenden Zugriffsberechtigungen sowohl auf Subversion als auch auf Ihre Projektarchive erteilen müssen. Das gilt auch für Anwendungen, die von Aktionsskripten aufgerufen werden. Die interne Gruppe dafür heißt \"LOCAL SERVICE\"." +"Beachten Sie, dass Sie dem lokalen Dienstekonto die entsprechenden Zugriffsberechtigungen sowohl auf Git als auch auf Ihre Projektarchive erteilen müssen. Das gilt auch für Anwendungen, die von Aktionsskripten aufgerufen werden. Die interne Gruppe dafür heißt \"LOCAL SERVICE\"." #. (para) #: ../source/TortoiseGit_en.xml:2678 @@ -2503,8 +2503,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2755 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" -msgstr "Falls Sie mehrere Projektarchive mit derselben Passwortdatenbank verwalten, wird die Einrichtung eines Anmeldebereichs das Leben für die Anwender vereinfachen, weil TortoiseGit Anmeldeinformationen speichern kann, so dass sie nur einmal eingegeben werden müssen. Weitere Informationen finden sich in folgenden Abschnitten des Subversion Buchs: Create a 'users' file and realm und Client Credentials Caching ." +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgstr "Falls Sie mehrere Projektarchive mit derselben Passwortdatenbank verwalten, wird die Einrichtung eines Anmeldebereichs das Leben für die Anwender vereinfachen, weil TortoiseGit Anmeldeinformationen speichern kann, so dass sie nur einmal eingegeben werden müssen. Weitere Informationen finden sich in folgenden Abschnitten des Git Buchs: Create a 'users' file and realm und Client Credentials Caching ." #. (title) #: ../source/TortoiseGit_en.xml:2773 @@ -2523,13 +2523,13 @@ msgstr "Was ist SASL?" #. (para) #: ../source/TortoiseGit_en.xml:2779 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." -msgstr "Beim Cyrus Simple Authentication and Security Layer handelt es sich um eine Open Source Bibliothek, die von der Carnegie Mellon Universität geschrieben wurde. Sie fügt allgemeine Anmelde- und Verschlüsselungsfunktionen zu jedem Netzwerkprotokoll hinzu. Ab Subversion 1.5 unterstützen sowohl der svnserve Server und der TortoiseGit Client diese Bibliothek." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgstr "Beim Cyrus Simple Authentication and Security Layer handelt es sich um eine Open Source Bibliothek, die von der Carnegie Mellon Universität geschrieben wurde. Sie fügt allgemeine Anmelde- und Verschlüsselungsfunktionen zu jedem Netzwerkprotokoll hinzu. Ab Git 1.5 unterstützen sowohl der svnserve Server und der TortoiseGit Client diese Bibliothek." #. (para) #: ../source/TortoiseGit_en.xml:2787 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." -msgstr "Für eine vollständige Beschreibung der zur Verfügung stehenden Optionen sollten Sie sich im Subversion Buch das Kapitel Using svnserve with SASL durchlesen. Wenn Sie nur an einem einfachen Verfahren interessiert sind, mit dessen Hilfe Sie sichere Anmeldung und Verschlüsselung auf einem Windows Server einrichten können, so dass auf Ihr Projektarchiv sicher über das große böse Internet zugegriffen werden kann, lesen Sie hier weiter." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgstr "Für eine vollständige Beschreibung der zur Verfügung stehenden Optionen sollten Sie sich im Git Buch das Kapitel Using svnserve with SASL durchlesen. Wenn Sie nur an einem einfachen Verfahren interessiert sind, mit dessen Hilfe Sie sichere Anmeldung und Verschlüsselung auf einem Windows Server einrichten können, so dass auf Ihr Projektarchiv sicher über das große böse Internet zugegriffen werden kann, lesen Sie hier weiter." #. (title) #: ../source/TortoiseGit_en.xml:2800 @@ -2548,13 +2548,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2810 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." -msgstr "Zweitens legen Sie eine Datei namens svn.conf an geeigneter Stelle an - typischerweise im Installationsverzeichnis von Subversion." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." +msgstr "Zweitens legen Sie eine Datei namens svn.conf an geeigneter Stelle an - typischerweise im Installationsverzeichnis von Git." #. (para) #: ../source/TortoiseGit_en.xml:2815 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." -msgstr "Drittens erzeugen Sie zwei neue Registrierungseinträge, damit SASL weiß, wo seine Dateien stehen. Erstellen Sie einen Schlüssel namens [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] und legen Sie dort zwei neue Zeichenketten an: SearchPath zeigt auf das Verzeichnis, das die sasl*.dll enthält (Normalerweise im Subversion Installationsverzeichnis), und ConfFile zeigt auf das Verzeichnis, das die svn.conf Datei enthält. Falls Sie den CollabNet Installer verwendet haben, wurden diese Einträge bereits erzeugt." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgstr "Drittens erzeugen Sie zwei neue Registrierungseinträge, damit SASL weiß, wo seine Dateien stehen. Erstellen Sie einen Schlüssel namens [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] und legen Sie dort zwei neue Zeichenketten an: SearchPath zeigt auf das Verzeichnis, das die sasl*.dll enthält (Normalerweise im Git Installationsverzeichnis), und ConfFile zeigt auf das Verzeichnis, das die svn.conf Datei enthält. Falls Sie den CollabNet Installer verwendet haben, wurden diese Einträge bereits erzeugt." #. (para) #: ../source/TortoiseGit_en.xml:2827 @@ -2642,8 +2642,8 @@ msgstr "Eine einfache Anleitung zum Einrichten Ihres Servers findet sich in Version Control with Subversion." -msgstr "Weitere Informationen über svnserve finden sich in Versionskontrolle mit Subversion ." +msgid "Further information about svnserve can be found in the Version Control with Git." +msgstr "Weitere Informationen über svnserve finden sich in Versionskontrolle mit Git ." #. (title) #: ../source/TortoiseGit_en.xml:2923 @@ -2653,25 +2653,25 @@ msgstr "Pfadbasierte Autorisierung mit svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" -"Beginnend mit Subversion 1.3, unterstützt svnserve die gleiche pfadbasierte Autorisierung über mod_authz_svn wie Apache. Sie müssen die Datei conf/svnserve.conf im Projektarchivverzeichnis bearbeiten und eine Zeile, die auf die Berechtigungsdatei verweist, einfügen:\n" +"Beginnend mit Git 1.3, unterstützt svnserve die gleiche pfadbasierte Autorisierung über mod_authz_svn wie Apache. Sie müssen die Datei conf/svnserve.conf im Projektarchivverzeichnis bearbeiten und eine Zeile, die auf die Berechtigungsdatei verweist, einfügen:\n" "[general]\n" "authz-db = authz\n" "Bei authz handelt es sich um eine Datei, die Sie anlegen, um die Zugriffsberechtigungen zu definieren. Sie können dieselbe Datei für mehrere Projektarchive verwenden. Informationen über das Dateiformat finden sich in ." #. (para) #: ../source/TortoiseGit_en.xml:2946 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." -msgstr "Egal welches Protokoll Sie verwenden, um auf das Projektarchiv zuzugreifen, Sie müssen jeweils mindestens ein Projektarchiv erstellen. Sie können dies entweder mit dem Subversion Kommandozeilen-Client oder mit TortoiseGit tun." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." +msgstr "Egal welches Protokoll Sie verwenden, um auf das Projektarchiv zuzugreifen, Sie müssen jeweils mindestens ein Projektarchiv erstellen. Sie können dies entweder mit dem Git Kommandozeilen-Client oder mit TortoiseGit tun." #. (para) #: ../source/TortoiseGit_en.xml:2951 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "Wenn Sie noch kein Subversion Projektarchiv erstellt haben, tun Sie dies jetzt." +msgid "If you haven't created a Git repository yet, it's time to do that now." +msgstr "Wenn Sie noch kein Git Projektarchiv erstellt haben, tun Sie dies jetzt." #. (title) #: ../source/TortoiseGit_en.xml:2959 @@ -2685,8 +2685,8 @@ msgstr "Projektarchiv anlegen" #. (para) #: ../source/TortoiseGit_en.xml:2963 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." -msgstr "Sie können ein Projektarchiv im FSFS Format oder im älteren Berkeley Database (BDB) Format erstellen. Das FSFS Format ist generell schneller, einfacher zu administrieren und es funktioniert auch auf Netzwerkfreigaben und Windows 98 ohne Probleme. Das BDB Format wurde als stabiler erachtet, weil es bereits länger in Gebrauch war, da aber FSFS mittlerweile auch schon mehrere Jahre intensiv genutzt wird, ist dieses Argument etwas schwach. Nähere Informationen zu den verschiedenen Formaten können Sie im Kapitel Choosing a Data Store im Subversion Buch nachlesen." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." +msgstr "Sie können ein Projektarchiv im FSFS Format oder im älteren Berkeley Database (BDB) Format erstellen. Das FSFS Format ist generell schneller, einfacher zu administrieren und es funktioniert auch auf Netzwerkfreigaben und Windows 98 ohne Probleme. Das BDB Format wurde als stabiler erachtet, weil es bereits länger in Gebrauch war, da aber FSFS mittlerweile auch schon mehrere Jahre intensiv genutzt wird, ist dieses Argument etwas schwach. Nähere Informationen zu den verschiedenen Formaten können Sie im Kapitel Choosing a Data Store im Git Buch nachlesen." #. (title) #: ../source/TortoiseGit_en.xml:2978 @@ -2796,8 +2796,8 @@ msgstr "UNC Pfade" #. (para) #: ../source/TortoiseGit_en.xml:3094 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." -msgstr "Um das lokale Projektarchiv anzusprechen, benötigen Sie den Pfad zum Projektarchiv-Ordner. Beachten Sie, dass Subversion alle Projektarchivpfade in der Form file:///C:/SVNRepository/ benötigt." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgstr "Um das lokale Projektarchiv anzusprechen, benötigen Sie den Pfad zum Projektarchiv-Ordner. Beachten Sie, dass Git alle Projektarchivpfade in der Form file:///C:/SVNRepository/ benötigt." #. (para) #: ../source/TortoiseGit_en.xml:3100 @@ -2807,7 +2807,7 @@ msgstr "Um ein Projektarchiv auf einer Netzwerkfreigabe anzusprechen können Sie #. (para) #: ../source/TortoiseGit_en.xml:3107 msgid "Prior to SVN 1.2, UNC paths had to be given in the more obscure form file:///\\ServerName/path/to/repos. This form is still supported, but not recommended." -msgstr "Vor Subversion 1.2, mussten UNC Pfade in dem obskuren Format file:///\\ServerName/path/to/repos angegeben werden. Dieses Format wird weiterhin unterstützt, aber nicht empfohlen." +msgstr "Vor Git 1.2, mussten UNC Pfade in dem obskuren Format file:///\\ServerName/path/to/repos angegeben werden. Dieses Format wird weiterhin unterstützt, aber nicht empfohlen." #. (para) #: ../source/TortoiseGit_en.xml:3114 @@ -2836,8 +2836,8 @@ msgstr "Erstens geben Sie jedem Anwender direkten Schreibzugriff auf das Projekt #. (para) #: ../source/TortoiseGit_en.xml:3141 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." -msgstr "Zweitens unterstützen nicht alle Netzwerk Dateiprotokolle die Sperr- und Schutzmechanismen, die Subversion erfordert, so dass das Projektarchiv beschädigt werden kann. Das muss nicht sofort passieren, aber eines Tages werden zwei Anwender gleichzeitig auf das Projektarchiv zugreifen. Schlimmstenfalls bleibt die Beschädigung eine Zeit lang unbemerkt." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgstr "Zweitens unterstützen nicht alle Netzwerk Dateiprotokolle die Sperr- und Schutzmechanismen, die Git erfordert, so dass das Projektarchiv beschädigt werden kann. Das muss nicht sofort passieren, aber eines Tages werden zwei Anwender gleichzeitig auf das Projektarchiv zugreifen. Schlimmstenfalls bleibt die Beschädigung eine Zeit lang unbemerkt." #. (para) #: ../source/TortoiseGit_en.xml:3147 @@ -2940,13 +2940,13 @@ msgstr "Wenn Sie eine /trunk /tags /branches Struktur wähl #. (para) #: ../source/TortoiseGit_en.xml:3220 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." -msgstr "Für völlig unabhängige Projekte sollten Sie besser pro Projekt ein einzelnes Projektarchiv anlegen. Der Grund dafür ist, dass wenn Sie Änderungen übertragen, die Revisionsnummer des Projektarchivs, nicht des Projektes hoch gezählt wird. Bei mehreren unabhängigen Projekten, die sich ein Archiv teilen, kann das zu Konfusion führen, wenn z.B. an einem der Projekte überhaupt nicht gearbeitet wird, an anderen jedoch viel. TortoiseGit und Subversion zum Beispiel, erscheinen auf demselben Server (tigris.org), sind aber völlig selbstständige Projekt(archiv)e, mit voneinander unabhängiger Entwicklung und ohne Verwirrung über Versionsnummern." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgstr "Für völlig unabhängige Projekte sollten Sie besser pro Projekt ein einzelnes Projektarchiv anlegen. Der Grund dafür ist, dass wenn Sie Änderungen übertragen, die Revisionsnummer des Projektarchivs, nicht des Projektes hoch gezählt wird. Bei mehreren unabhängigen Projekten, die sich ein Archiv teilen, kann das zu Konfusion führen, wenn z.B. an einem der Projekte überhaupt nicht gearbeitet wird, an anderen jedoch viel. TortoiseGit und Git zum Beispiel, erscheinen auf demselben Server (tigris.org), sind aber völlig selbstständige Projekt(archiv)e, mit voneinander unabhängiger Entwicklung und ohne Verwirrung über Versionsnummern." #. (para) #: ../source/TortoiseGit_en.xml:3230 msgid "Of course, you're free to ignore these common layouts. You can create any sort of variation, whatever works best for you or your team. Remember that whatever you choose, it's not a permanent commitment. You can reorganize your repository at any time. Because branches and tags are ordinary directories, TortoiseGit can move or rename them however you wish." -msgstr "Natürlich können Sie diese Empfehlungen auch ignorieren. Es steht Ihnen frei, ein Layout zu wählen welches am besten für Sie oder Ihr Team geeignet ist. Beachten Sie auch, dass was immer für eine Wahl Sie treffen diese nicht fix ist. Sie können das Layout später immer noch reorganisieren. Weil Zweige (branches) und Marken (tags) gewöhnliche Ordner in Subversion sind, können Sie diese ganz einfach mit TortoiseGit umbenennen oder verschieben wie Sie wollen." +msgstr "Natürlich können Sie diese Empfehlungen auch ignorieren. Es steht Ihnen frei, ein Layout zu wählen welches am besten für Sie oder Ihr Team geeignet ist. Beachten Sie auch, dass was immer für eine Wahl Sie treffen diese nicht fix ist. Sie können das Layout später immer noch reorganisieren. Weil Zweige (branches) und Marken (tags) gewöhnliche Ordner in Git sind, können Sie diese ganz einfach mit TortoiseGit umbenennen oder verschieben wie Sie wollen." #. (para) #: ../source/TortoiseGit_en.xml:3238 @@ -3032,8 +3032,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3332 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "Das svnadmin Programm wird automatisch installiert wenn Sie den Subversion Kommandozeilen-Client installieren. Wenn Sie die Kommandozeilenprogramme auf einem Windows-PC installieren ist es am besten, die Windows-Installerversion zu verwenden. Diese ist besser komprimiert als die zip-Version und nimmt auch alle Pfad-Einstellungen für Sie vor. Sie können die jeweils aktuellste Version hier holen: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "Das svnadmin Programm wird automatisch installiert wenn Sie den Git Kommandozeilen-Client installieren. Wenn Sie die Kommandozeilenprogramme auf einem Windows-PC installieren ist es am besten, die Windows-Installerversion zu verwenden. Diese ist besser komprimiert als die zip-Version und nimmt auch alle Pfad-Einstellungen für Sie vor. Sie können die jeweils aktuellste Version hier holen: http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:3347 @@ -3059,8 +3059,8 @@ msgstr "Serverseitige Aktionsskripte" #. (para) #: ../source/TortoiseGit_en.xml:3357 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." -msgstr "Ein Aktionsskript (Hook-Script) ist ein Programm, welches durch bestimmte Ereignisse im Projektarchiv gestartet wird, z.B. wenn eine neue Revision erzeugt oder eine Revisions-Eigenschaft verändert wird. Jedem Skript werden Information übergeben über das Ereignis selbst, die Ziele des Ereignisses und der Benutzername der Person welche das Ereignis ausgelöst hat. Abhängig vom Rückgabewert des Aktionsskripts wird die Operation fortgesetzt, angehalten oder unterbrochen. Bitte lesen Sie dazu das Kapitel Hook Scripts im Subversion Buch." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." +msgstr "Ein Aktionsskript (Hook-Script) ist ein Programm, welches durch bestimmte Ereignisse im Projektarchiv gestartet wird, z.B. wenn eine neue Revision erzeugt oder eine Revisions-Eigenschaft verändert wird. Jedem Skript werden Information übergeben über das Ereignis selbst, die Ziele des Ereignisses und der Benutzername der Person welche das Ereignis ausgelöst hat. Abhängig vom Rückgabewert des Aktionsskripts wird die Operation fortgesetzt, angehalten oder unterbrochen. Bitte lesen Sie dazu das Kapitel Hook Scripts im Git Buch." #. (para) #: ../source/TortoiseGit_en.xml:3372 @@ -3111,8 +3111,8 @@ msgstr "Webseite" #. (para) #: ../source/TortoiseGit_en.xml:3411 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." -msgstr "Wenn Sie Ihr Subversion Projektarchiv anderen Entwicklern zugängig machen wollen, möchten Sie vielleicht von Ihrer Webseite aus direkt darauf verweisen. Eine Möglichkeit besteht darin, einen Auscheck Verweis für andere TortoiseGit Nutzer dort zu platzieren." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgstr "Wenn Sie Ihr Git Projektarchiv anderen Entwicklern zugängig machen wollen, möchten Sie vielleicht von Ihrer Webseite aus direkt darauf verweisen. Eine Möglichkeit besteht darin, einen Auscheck Verweis für andere TortoiseGit Nutzer dort zu platzieren." #. (para) #: ../source/TortoiseGit_en.xml:3417 @@ -3177,18 +3177,18 @@ msgstr "Anleitung zum täglichen Gebrauch" #. (para) #: ../source/TortoiseGit_en.xml:3457 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." -msgstr "Dieses Kapitel beschreibt den täglichen Umgang mit TortoiseGit. Es ist nicht als Einführung in Versionskontrollsysteme gedacht, und auch nicht als Einführung in Subversion (SVN). Dies ist mehr ein Nachschlagewerk wenn Sie nicht mehr genau wissen wie eine Funktion ausgeführt wird, sie aber zumindest wissen was Sie tun wollen." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgstr "Dieses Kapitel beschreibt den täglichen Umgang mit TortoiseGit. Es ist nicht als Einführung in Versionskontrollsysteme gedacht, und auch nicht als Einführung in Git (SVN). Dies ist mehr ein Nachschlagewerk wenn Sie nicht mehr genau wissen wie eine Funktion ausgeführt wird, sie aber zumindest wissen was Sie tun wollen." #. (para) #: ../source/TortoiseGit_en.xml:3465 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." -msgstr "Falls Sie eine Anleitung für Versionskontrolle mit Subversion benötigen, empfehlen wir das fantastische Buch Versionskontrolle mit Subversion ." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." +msgstr "Falls Sie eine Anleitung für Versionskontrolle mit Git benötigen, empfehlen wir das fantastische Buch Versionskontrolle mit Git ." #. (para) #: ../source/TortoiseGit_en.xml:3472 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." -msgstr "An diesem Dokument wird ständig gearbeitet, wie auch an TortoiseGit und Subversion immer weitergearbeitet wird. Falls Sie Fehler feststellen, melden Sie diese an die Mailing-Liste damit wir die Dokumentation aktualisieren können. Einige der Screenshots in diesem Dokument zeigen wahrscheinlich nicht den aktuellsten Stand der Software. Seien Sie bitte nachsichtig. Wir arbeiten an TortoiseGit und der Dokumentation während unserer Freizeit." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgstr "An diesem Dokument wird ständig gearbeitet, wie auch an TortoiseGit und Git immer weitergearbeitet wird. Falls Sie Fehler feststellen, melden Sie diese an die Mailing-Liste damit wir die Dokumentation aktualisieren können. Einige der Screenshots in diesem Dokument zeigen wahrscheinlich nicht den aktuellsten Stand der Software. Seien Sie bitte nachsichtig. Wir arbeiten an TortoiseGit und der Dokumentation während unserer Freizeit." #. (para) #: ../source/TortoiseGit_en.xml:3484 @@ -3202,13 +3202,13 @@ msgstr "Sie kennen sich mit Versionskontrollsystemen aus." #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." -msgstr "Sie kennen die Grundlagen von Subversion." +msgid "You should know the basics of Git." +msgstr "Sie kennen die Grundlagen von Git." #. (para) #: ../source/TortoiseGit_en.xml:3499 -msgid "You should have set up a server and/or have access to a Subversion repository." -msgstr "Sie haben einen Server installiert und/oder haben Zugriff auf ein Subversion Projektarchiv." +msgid "You should have set up a server and/or have access to a Git repository." +msgstr "Sie haben einen Server installiert und/oder haben Zugriff auf ein Git Projektarchiv." #. (para) #: ../source/TortoiseGit_en.xml:3480 @@ -3397,13 +3397,13 @@ msgstr "svn.username enthält die Daten für Anmeldung per #. (para) #: ../source/TortoiseGit_en.xml:3650 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " -msgstr "Wenn das Projektarchiv, auf das Sie zugreifen wollen, passwortgeschützt ist, erscheint folgender Anmeldedialog. Geben Sie Ihren Benutzernamen und Ihr Passwort ein. Die Option bewirkt, dass TortoiseGit die Anmeldeinformationen in einem von drei Unterordnern des Subversion Konfigurationsverzeichnis %APPDATA%\\Subversion\\auth ablegt: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " +msgstr "Wenn das Projektarchiv, auf das Sie zugreifen wollen, passwortgeschützt ist, erscheint folgender Anmeldedialog. Geben Sie Ihren Benutzernamen und Ihr Passwort ein. Die Option bewirkt, dass TortoiseGit die Anmeldeinformationen in einem von drei Unterordnern des Git Konfigurationsverzeichnis %APPDATA%\\Git\\auth ablegt: " #. (para) #: ../source/TortoiseGit_en.xml:3681 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." -msgstr "Wenn Sie die Anmeldedaten für alle Server löschen wollen, können Sie dies von der Gespeicherte Daten Seite der TortoiseGit Optionen aus tun. Die Schaltfläche löscht sämtliche Anmeldedaten aus den Subversion auth Verzeichnissen sowie die durch ältere Versionen von TortoiseGit in der Registrierung abgelegten Anmeldedaten. Weitere Informationen stehen in ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgstr "Wenn Sie die Anmeldedaten für alle Server löschen wollen, können Sie dies von der Gespeicherte Daten Seite der TortoiseGit Optionen aus tun. Die Schaltfläche löscht sämtliche Anmeldedaten aus den Git auth Verzeichnissen sowie die durch ältere Versionen von TortoiseGit in der Registrierung abgelegten Anmeldedaten. Weitere Informationen stehen in ." #. (para) #: ../source/TortoiseGit_en.xml:3690 @@ -3478,8 +3478,8 @@ msgstr "Es kann leicht passieren, dass Sie die Daten in einen falschen Ordner im #. (para) #: ../source/TortoiseGit_en.xml:3736 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." -msgstr "Dieser Abschnitt beschreibt den Import-Befehl von Subversion, der dazu gedacht ist, eine Verzeichnisstruktur in ein Projektarchiv zu importieren. Obwohl er für diese Aufgabe geeignet ist, besitzt er doch einige Nachteile: Aus diesen Gründen empfehlen wir, dass Sie den Import-Befehl gar nicht nutzen sondern die in beschriebene zweistufige Methode. Aber da sie schon diesen Abschnitt lesen, folgt nun eine kurze Einführung ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgstr "Dieser Abschnitt beschreibt den Import-Befehl von Git, der dazu gedacht ist, eine Verzeichnisstruktur in ein Projektarchiv zu importieren. Obwohl er für diese Aufgabe geeignet ist, besitzt er doch einige Nachteile: Aus diesen Gründen empfehlen wir, dass Sie den Import-Befehl gar nicht nutzen sondern die in beschriebene zweistufige Methode. Aber da sie schon diesen Abschnitt lesen, folgt nun eine kurze Einführung ..." #. (para) #: ../source/TortoiseGit_en.xml:3768 @@ -3598,8 +3598,8 @@ msgstr "Als Beispiel sehen Sie sich einmal das Erstellungsskript von TortoiseGit #. (para) #: ../source/TortoiseGit_en.xml:3916 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." -msgstr "Um die Benutzer nicht zu stören, ist die Datei TortoiseVars.bat auch in der Liste der ignorierten Dateien eingetragen. Das heißt wir haben die Subversion Eigenschaft svn:ignored für diese Datei gesetzt. Damit erscheint diese Datei nicht in jedem Übertragen-Dialog als (noch) nicht versioniert." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgstr "Um die Benutzer nicht zu stören, ist die Datei TortoiseVars.bat auch in der Liste der ignorierten Dateien eingetragen. Das heißt wir haben die Git Eigenschaft svn:ignored für diese Datei gesetzt. Damit erscheint diese Datei nicht in jedem Übertragen-Dialog als (noch) nicht versioniert." #. (title) #: ../source/TortoiseGit_en.xml:3925 @@ -3626,18 +3626,18 @@ msgstr "Manchmal ist es nützlich eine Arbeitskopie zu haben, die aus mehreren a #. (para) #: ../source/TortoiseGit_en.xml:3940 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" -"Nehmen wir an Sie erstellen eine Arbeitskopie von /projekt1 in D:\\dev\\projekt1. Selektieren Sie den Ordner D:\\dev\\projekt1, machen Sie einen Rechtsklick und wählen Sie Windows Menü Eigenschaften aus dem Kontextmenü. Der Eigenschaften-Dialog erscheint, auf dessen Subversion Tab Sie Eigenschaften anschauen, verändern oder setzen können. Klicken Sie auf Hinzufügen... und wählen Sie die svn:externals Eigenschaft aus der Liste und schreiben Sie die zu referenzierende Projektarchiv URL in dem Format Name URL oder, wenn Sie eine bestimmte Revision angeben wollen, Name -rREV URL in das Textfeld. Sie können mehrere externe Projekte - eines pro Zeile - hinzufügen. Beachten Sie, dass Sonderzeichen in URLs korrekt ersetzt werden müssen (Leerzeichen z.B. durch %20), damit die externen Verweise funktionieren. Nehmen wir an, Sie haben folgende Eigenschaften auf D:\\dev\\projekt1 gesetzt:\n" +"Nehmen wir an Sie erstellen eine Arbeitskopie von /projekt1 in D:\\dev\\projekt1. Selektieren Sie den Ordner D:\\dev\\projekt1, machen Sie einen Rechtsklick und wählen Sie Windows Menü Eigenschaften aus dem Kontextmenü. Der Eigenschaften-Dialog erscheint, auf dessen Git Tab Sie Eigenschaften anschauen, verändern oder setzen können. Klicken Sie auf Hinzufügen... und wählen Sie die svn:externals Eigenschaft aus der Liste und schreiben Sie die zu referenzierende Projektarchiv URL in dem Format Name URL oder, wenn Sie eine bestimmte Revision angeben wollen, Name -rREV URL in das Textfeld. Sie können mehrere externe Projekte - eines pro Zeile - hinzufügen. Beachten Sie, dass Sonderzeichen in URLs korrekt ersetzt werden müssen (Leerzeichen z.B. durch %20), damit die externen Verweise funktionieren. Nehmen wir an, Sie haben folgende Eigenschaften auf D:\\dev\\projekt1 gesetzt:\n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" "\n" -"Klicken Sie auf Setzen und übertragen Sie Ihre Änderungen. Sobald jetzt jemand seine Arbeitskopie aktualisiert, wird Subversion einen Unterordner D:\\dev\\projekt1\\sounds anlegen und in diesen das Sounds Projekt auschecken, einen weiteren Unterordner D:\\dev\\projekt1\\quick graphs mit dem Graphics Projekt, und schließlich einen verschachtelten Unterordner D:\\dev\\project1\\skins\\toolkit, der Revision 21 des Skinmaker Projekts enthält." +"Klicken Sie auf Setzen und übertragen Sie Ihre Änderungen. Sobald jetzt jemand seine Arbeitskopie aktualisiert, wird Git einen Unterordner D:\\dev\\projekt1\\sounds anlegen und in diesen das Sounds Projekt auschecken, einen weiteren Unterordner D:\\dev\\projekt1\\quick graphs mit dem Graphics Projekt, und schließlich einen verschachtelten Unterordner D:\\dev\\project1\\skins\\toolkit, der Revision 21 des Skinmaker Projekts enthält." #. (para) #: ../source/TortoiseGit_en.xml:3980 @@ -3665,8 +3665,8 @@ msgstr "Wenn Sie absolute URLs in Ihren svn:externals Verweis #. (para) #: ../source/TortoiseGit_en.xml:4016 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." -msgstr "Um solche Probleme zu vermeiden, unterstützen Subversion Clients ab Version 1.5 relative externe URLs. Es stehen vier verschiedene Methoden zur Verfügung, um externe URLs festzulegen. In den folgenden Beispielen nehmen wir zwei Projektarchive an: Eines in http://example.com/svn/repos-1 und ein weiteres in http://example.com/svn/repos-2. Wir haben http://example.com/svn/repos-1/projekt/trunk in C:\\Projekt ausgecheckt und die svn:externals Eigenschaft ist auf trunk gesetzt." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgstr "Um solche Probleme zu vermeiden, unterstützen Git Clients ab Version 1.5 relative externe URLs. Es stehen vier verschiedene Methoden zur Verfügung, um externe URLs festzulegen. In den folgenden Beispielen nehmen wir zwei Projektarchive an: Eines in http://example.com/svn/repos-1 und ein weiteres in http://example.com/svn/repos-2. Wir haben http://example.com/svn/repos-1/projekt/trunk in C:\\Projekt ausgecheckt und die svn:externals Eigenschaft ist auf trunk gesetzt." #. (term) #: ../source/TortoiseGit_en.xml:4031 @@ -3894,8 +3894,8 @@ msgstr "Wiederholen Sie diesen Vorgang für Projekt25." #. (para) #: ../source/TortoiseGit_en.xml:4298 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." -msgstr "Navigieren Sie zu Projekt76/Unterprojekt und wiederholen Sie die Aktion. Beachten Sie, dass danacht der Ordner Projekt76 bis auf den vollständig gefüllten Unterordner Unterprojekt leer ist. Subversion hat für Sie die dazwischen liegenden Ordner angelegt, ohne sie zu füllen." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." +msgstr "Navigieren Sie zu Projekt76/Unterprojekt und wiederholen Sie die Aktion. Beachten Sie, dass danacht der Ordner Projekt76 bis auf den vollständig gefüllten Unterordner Unterprojekt leer ist. Git hat für Sie die dazwischen liegenden Ordner angelegt, ohne sie zu füllen." #. (title) #: ../source/TortoiseGit_en.xml:4308 @@ -3904,8 +3904,8 @@ msgstr "Die Tiefe der Arbeitskopie kann nicht reduziert werden" #. (para) #: ../source/TortoiseGit_en.xml:4309 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." -msgstr "Sobald Sie eine Arbeitskopie mit einer bestimmten Tiefe ausgecheckt haben, können Sie diese erhöhen, um mehr Inhalt in der Arbeitskopie zu bekommen. Allerdings ist es nicht möglich, die Tiefe wieder zu reduzieren, um Inhalte zu entfernen. Diese Funktion wird vielleicht in einer zukünftigen Version von Subversion hinzugefügt." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." +msgstr "Sobald Sie eine Arbeitskopie mit einer bestimmten Tiefe ausgecheckt haben, können Sie diese erhöhen, um mehr Inhalt in der Arbeitskopie zu bekommen. Allerdings ist es nicht möglich, die Tiefe wieder zu reduzieren, um Inhalte zu entfernen. Diese Funktion wird vielleicht in einer zukünftigen Version von Git hinzugefügt." #. (title) #: ../source/TortoiseGit_en.xml:4317 @@ -4046,8 +4046,8 @@ msgstr "Die im unteren Bereich angezeigten Spalten können angepasst werden. Wen #. (para) #: ../source/TortoiseGit_en.xml:4495 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." -msgstr "Standardmäßig werden bei einer erfolgreichen Übertragung die von Ihnen gesperrten Dateien wieder freigegeben. Falls sie jedoch die Sperren behalten möchten, aktivieren Sie die Option Sperren behalten. Als Vorgabewert des Auswahlkästchen wird aus der Einstellung no_unlock in der Subversion Konfigurationsdatei verwendet. Lesen Sie in nach, wie sie die Subversion Konfigurationsdatei bearbeiten können." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." +msgstr "Standardmäßig werden bei einer erfolgreichen Übertragung die von Ihnen gesperrten Dateien wieder freigegeben. Falls sie jedoch die Sperren behalten möchten, aktivieren Sie die Option Sperren behalten. Als Vorgabewert des Auswahlkästchen wird aus der Einstellung no_unlock in der Git Konfigurationsdatei verwendet. Lesen Sie in nach, wie sie die Git Konfigurationsdatei bearbeiten können." #. (para) #: ../source/TortoiseGit_en.xml:4506 @@ -4070,8 +4070,8 @@ msgstr "Externes Umbenennen reparieren" #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5337 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Manchmal werden Dateien außerhalb von Subversion umbenannt, und sie werden in der Dateiliste als eine fehlende und eine nicht-versionierte Datei angezeigt. Damit sie die Historie der Datei nicht verlieren, müssen Sie Subversion über die Umbenennung informieren. Markieren Sie einfach beide, die alte (fehlende) und die neue (unversionierte) Datei und wählen Sie Kontextmenü Umbenennen reparieren, um die beiden Dateien zu einer Umbenennung zusammenzufassen." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Manchmal werden Dateien außerhalb von Git umbenannt, und sie werden in der Dateiliste als eine fehlende und eine nicht-versionierte Datei angezeigt. Damit sie die Historie der Datei nicht verlieren, müssen Sie Git über die Umbenennung informieren. Markieren Sie einfach beide, die alte (fehlende) und die neue (unversionierte) Datei und wählen Sie Kontextmenü Umbenennen reparieren, um die beiden Dateien zu einer Umbenennung zusammenzufassen." #. (title) #. (title) @@ -4082,8 +4082,8 @@ msgstr "Änderungslisten" #. (para) #: ../source/TortoiseGit_en.xml:4539 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." -msgstr "Der Übertragen-Dialog unterstützt die Änderungslisten von Subversion, mit der zueinander gehörende Dateien gruppiert werden können. Eine Beschreibung dieser Funktion findet sich in ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." +msgstr "Der Übertragen-Dialog unterstützt die Änderungslisten von Git, mit der zueinander gehörende Dateien gruppiert werden können. Eine Beschreibung dieser Funktion findet sich in ." #. (title) #: ../source/TortoiseGit_en.xml:4546 @@ -4366,8 +4366,8 @@ msgstr "Lokale Datei existiert bereits" #. (para) #: ../source/TortoiseGit_en.xml:4881 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." -msgstr "Manchmal wird die Aktualisierung mit einer Fehlermeldung abbrechen welche besagt dass eine Datei mit demselben Namen bereits existiert. Dies passiert wenn Subversion eine neu versionierte Datei auschecken möchte, aber eine Datei mit demselben Namen und Pfad bereits in Ihrer Arbeitskopie vorhanden ist. Subversion wird niemals eine solche Datei überschreiben - Sie könnten dadurch ja wichtige Daten verlieren." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgstr "Manchmal wird die Aktualisierung mit einer Fehlermeldung abbrechen welche besagt dass eine Datei mit demselben Namen bereits existiert. Dies passiert wenn Git eine neu versionierte Datei auschecken möchte, aber eine Datei mit demselben Namen und Pfad bereits in Ihrer Arbeitskopie vorhanden ist. Git wird niemals eine solche Datei überschreiben - Sie könnten dadurch ja wichtige Daten verlieren." #. (para) #: ../source/TortoiseGit_en.xml:4890 @@ -4416,21 +4416,21 @@ msgstr "filename.ext.rNEWREV" #. (para) #: ../source/TortoiseGit_en.xml:4960 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." msgstr "Dies ist die Datei, wie sie im Projektarchiv gerade aktuell ist, d.h. diese Datei hat die Änderungen von den anderen Mitarbeitern bereits integriert, jedoch noch nicht die Ihren." #. (para) #: ../source/TortoiseGit_en.xml:4915 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" -"Manchmal werden Sie einen Konflikt erhalten wenn Sie Ihre Arbeitskopie aktualisieren. Ein Konflikt tritt dann auf wenn mehrere Personen die gleiche(n) Stelle(n) in derselben Datei verändert haben. Da Subversion nichts über Ihr Projekt weiß, überlässt es in solchen Fällen Ihnen, den Konflikt aufzulösen. Wann immer ein Konflikt auftritt können Sie die entsprechende Datei öffnen und nach Zeilen suchen welche beginnen mit: <<<<<<<. Die Zeile in Konflikt ist so markiert:\n" +"Manchmal werden Sie einen Konflikt erhalten wenn Sie Ihre Arbeitskopie aktualisieren. Ein Konflikt tritt dann auf wenn mehrere Personen die gleiche(n) Stelle(n) in derselben Datei verändert haben. Da Git nichts über Ihr Projekt weiß, überlässt es in solchen Fällen Ihnen, den Konflikt aufzulösen. Wann immer ein Konflikt auftritt können Sie die entsprechende Datei öffnen und nach Zeilen suchen welche beginnen mit: <<<<<<<. Die Zeile in Konflikt ist so markiert:\n" "<<<<<<< Dateiname\n" " Ihre Änderungen\n" "=======\n" @@ -4447,12 +4447,12 @@ msgstr "Sie können nun entweder einen Konflikteditor benutzen, den Sie durch de #. (para) #: ../source/TortoiseGit_en.xml:4981 msgid "Afterwards execute the command TortoiseGitResolved and commit your modifications to the repository. Please note that the Resolve command does not really resolve the conflict. It just removes the filename.ext.mine and filename.ext.r* files, to allow you to commit your changes." -msgstr "Anschließend müssen Sie Subversion noch mitteilen, dass Sie den Konflikt aufgelöst haben. Dies geschieht mit dem Befehl TortoiseGit Konflikt aufgelöst. Bitte beachten Sie dass dieser Befehl nicht den Konflikt selbst löst, sondern nur Subversion mitteilt dass Sie selbst den Konflikt bereits gelöst haben. Der Befehl macht nichts weiter als die drei zusätzlich erstellten Dateien filename.ext.mine und filename.ext.r*zu löschen, damit sie Ihre Änderungen in das Projektarchiv übertragen können." +msgstr "Anschließend müssen Sie Git noch mitteilen, dass Sie den Konflikt aufgelöst haben. Dies geschieht mit dem Befehl TortoiseGit Konflikt aufgelöst. Bitte beachten Sie dass dieser Befehl nicht den Konflikt selbst löst, sondern nur Git mitteilt dass Sie selbst den Konflikt bereits gelöst haben. Der Befehl macht nichts weiter als die drei zusätzlich erstellten Dateien filename.ext.mine und filename.ext.r*zu löschen, damit sie Ihre Änderungen in das Projektarchiv übertragen können." #. (para) #: ../source/TortoiseGit_en.xml:4994 -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." -msgstr "Falls ein Konflikt zwischen Binärdaten besteht, versucht Subversion nicht, die Daten selbst zusammenzuführen. Die lokale Datei bleibt unverändert (exakt so, wie sie Ihrer letzten Änderung entspricht) und Sie erhalten Dateiname.ext.r* Dateien. Wenn Sie Ihre eigenen Änderungen verwerfen wollen, tun Sie das mit dem Rückgängig Befehl. Wenn Sie Ihre Version beibehalten und die Version im Projektarchiv überschreiben wollen, verwenden Sie den Konflikt aufgelöst Befehl und übertragen anschließend die Daten ins Projektarchiv" +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgstr "Falls ein Konflikt zwischen Binärdaten besteht, versucht Git nicht, die Daten selbst zusammenzuführen. Die lokale Datei bleibt unverändert (exakt so, wie sie Ihrer letzten Änderung entspricht) und Sie erhalten Dateiname.ext.r* Dateien. Wenn Sie Ihre eigenen Änderungen verwerfen wollen, tun Sie das mit dem Rückgängig Befehl. Wenn Sie Ihre Version beibehalten und die Version im Projektarchiv überschreiben wollen, verwenden Sie den Konflikt aufgelöst Befehl und übertragen anschließend die Daten ins Projektarchiv" #. (para) #: ../source/TortoiseGit_en.xml:5004 @@ -4500,13 +4500,13 @@ msgstr "Symbole" #. (para) #: ../source/TortoiseGit_en.xml:5046 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "Nun da Sie eine frisch ausgecheckte Arbeitskopie eines Subversion Projektarchivs haben zeigt Ihnen der Explorer diese Dateien und Ordner mit leicht geänderten Symbolen an. Dies ist mit ein Grund weshalb TortoiseGit so populär ist. TortoiseGit fügt jedem Datei- / Ordnersymbol ein kleines überlagertes Symbol hinzu. Abhängig vom Subversion Status wird ein unterschiedliches Symbol überlagert angezeigt." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." +msgstr "Nun da Sie eine frisch ausgecheckte Arbeitskopie eines Git Projektarchivs haben zeigt Ihnen der Explorer diese Dateien und Ordner mit leicht geänderten Symbolen an. Dies ist mit ein Grund weshalb TortoiseGit so populär ist. TortoiseGit fügt jedem Datei- / Ordnersymbol ein kleines überlagertes Symbol hinzu. Abhängig vom Git Status wird ein unterschiedliches Symbol überlagert angezeigt." #. (para) #: ../source/TortoiseGit_en.xml:5054 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " Eine frisch ausgecheckte Arbeitskopie hat nur überlagerte Symbole mit grünem Haken. Dies bedeutet dass der Subversion Status normal ist." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " Eine frisch ausgecheckte Arbeitskopie hat nur überlagerte Symbole mit grünem Haken. Dies bedeutet dass der Git Status normal ist." #. (para) #: ../source/TortoiseGit_en.xml:5059 @@ -4524,17 +4524,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5072 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." msgstr "" "\n" -"Wenn eine Datei die svn:needs-lock Eigenschaft besitzt, setzt Subversion den Schreibschutz für diese Datei, bis Sie eine Sperre für die Datei holen. Schreibgeschützte Dateien erhalten dieses Symbol, um anzuzeigen, dass Sie die Datei erst sperren müssen, bevor Sie sie bearbeiten können." +"Wenn eine Datei die svn:needs-lock Eigenschaft besitzt, setzt Git den Schreibschutz für diese Datei, bis Sie eine Sperre für die Datei holen. Schreibgeschützte Dateien erhalten dieses Symbol, um anzuzeigen, dass Sie die Datei erst sperren müssen, bevor Sie sie bearbeiten können." #. (para) #: ../source/TortoiseGit_en.xml:5079 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." msgstr "" "\n" -"Wenn Sie die Sperre für eine Datei besitzen und der Subversion Status normal ist, erinnert Sie dieses Symbol daran, dass Sie die Sperre wieder freigeben müssen, wenn Sie sie nicht benötigen, damit andere ihre Änderungen übertragen können." +"Wenn Sie die Sperre für eine Datei besitzen und der Git Status normal ist, erinnert Sie dieses Symbol daran, dass Sie die Sperre wieder freigeben müssen, wenn Sie sie nicht benötigen, damit andere ihre Änderungen übertragen können." #. (para) #: ../source/TortoiseGit_en.xml:5086 @@ -4576,8 +4576,8 @@ msgstr "Da es mittlerweile viele Tortoise Clients gibt (TortoiseCVS, TortoiseHG, #. (para) #: ../source/TortoiseGit_en.xml:5124 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." -msgstr "Eine Beschreibung, wie die überlagerten Symbole mit dem Subversion Status zusammenhängen und weitere technische Details finden sich in ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." +msgstr "Eine Beschreibung, wie die überlagerten Symbole mit dem Git Status zusammenhängen und weitere technische Details finden sich in ." #. (title) #: ../source/TortoiseGit_en.xml:5131 @@ -5013,8 +5013,8 @@ msgstr "Die Logdetails der gewählten Revisionen in die Zwischenablage kopieren. #. (para) #: ../source/TortoiseGit_en.xml:5742 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." -msgstr "Die Logmeldungen durchsuchen. Die von Subversion generierte Liste der geänderten Dateien wird einbezogen. Die Suche ignoriert Groß-/Kleinschreibung." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." +msgstr "Die Logmeldungen durchsuchen. Die von Git generierte Liste der geänderten Dateien wird einbezogen. Die Suche ignoriert Groß-/Kleinschreibung." #. (para) #: ../source/TortoiseGit_en.xml:5581 @@ -5100,8 +5100,8 @@ msgstr "Die Änderungen der gewählten Datei in dieser Revision rückgängig mac #. (para) #: ../source/TortoiseGit_en.xml:5843 -msgid "View the Subversion properties for the selected item." -msgstr "Die Subversion-Eigenschaften für das ausgewählte Objekt anzeigen." +msgid "View the Git properties for the selected item." +msgstr "Die Git-Eigenschaften für das ausgewählte Objekt anzeigen." #. (para) #: ../source/TortoiseGit_en.xml:5848 @@ -5125,18 +5125,18 @@ msgstr "Sie werden bemerkt haben, dass wir manchmal von Änderungen und manchmal #. (para) #: ../source/TortoiseGit_en.xml:5865 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." -msgstr "Subversion verwendet Revisionsnummern in zwei verschiedenen Zusammenhängen. Zum Einen referenziert eine Revisionsnummer den Status eines Projektarchives zu einem gewissen Zeitpunkt. Zum Anderen wird damit auch der Satz von Änderungen bezeichnet, der diese Revision erzeugt hat. Erledigt in Revision r1234 bedeutet z.B. das Funktion X in Revision 1234 implementiert wurde. Um die Bedeutung klarer zu machen, verwenden wir zwei verschiedene Begriffe." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgstr "Git verwendet Revisionsnummern in zwei verschiedenen Zusammenhängen. Zum Einen referenziert eine Revisionsnummer den Status eines Projektarchives zu einem gewissen Zeitpunkt. Zum Anderen wird damit auch der Satz von Änderungen bezeichnet, der diese Revision erzeugt hat. Erledigt in Revision r1234 bedeutet z.B. das Funktion X in Revision 1234 implementiert wurde. Um die Bedeutung klarer zu machen, verwenden wir zwei verschiedene Begriffe." #. (para) #: ../source/TortoiseGit_en.xml:5874 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." -msgstr "Wenn Sie zwei Revisionen N und M wählen, wird das Kontextmenü Ihnen die Unterschiede zwischen diesen Revisionen anbieten. In Subversion Terminologie also diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." +msgstr "Wenn Sie zwei Revisionen N und M wählen, wird das Kontextmenü Ihnen die Unterschiede zwischen diesen Revisionen anbieten. In Git Terminologie also diff -r M:N." #. (para) #: ../source/TortoiseGit_en.xml:5880 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." -msgstr "Wenn Sie eine einzelne Revision N wählen, wird das Kontextmenü Ihnen die Änderungen in dieser Revision anbieten. In Subversion Terminologie also diff -r N-1:N oder diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." +msgstr "Wenn Sie eine einzelne Revision N wählen, wird das Kontextmenü Ihnen die Änderungen in dieser Revision anbieten. In Git Terminologie also diff -r N-1:N oder diff -c N." #. (para) #: ../source/TortoiseGit_en.xml:5886 @@ -5170,8 +5170,8 @@ msgstr "Wenn der Log-Dialog aus dem Zusammenführen-Dialog heraus aufgerufen wir #. (para) #: ../source/TortoiseGit_en.xml:5935 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." -msgstr "Beachten Sie, dass Subversion Umbenennen derzeit als aufeinanderfolgende Kopieren/Löschen Aktionen implementiert, so dass die Log Anzeige ebenfalls anhält, wenn ein Ordner / eine Datei umbenannt wurde, falls diese Option gewählt ist." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgstr "Beachten Sie, dass Git Umbenennen derzeit als aufeinanderfolgende Kopieren/Löschen Aktionen implementiert, so dass die Log Anzeige ebenfalls anhält, wenn ein Ordner / eine Datei umbenannt wurde, falls diese Option gewählt ist." #. (para) #: ../source/TortoiseGit_en.xml:5894 @@ -5225,8 +5225,8 @@ msgstr "Protokoll der Datenintegration" #. (para) #: ../source/TortoiseGit_en.xml:5990 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." -msgstr "Subversion 1.5 und neuer speichern die in einem Zweig zusammengeführten Revisionen in einer Eigenschaft des Zweiges ab. Dies ermöglicht es, eine detaillierte Historie von bereits durchgeführten Integrationsschritten zu erhalten. Wenn Sie zum Beispiel eine neue Funktion in einem Zweig entwickeln und die fertige Entwicklung im Stamm zusammenführen, wird das Log für den Stamm nur eine Revision anzeigen, obwohl darin vielleicht 1000 Revisionen des Zweiges enthalten sind." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgstr "Git 1.5 und neuer speichern die in einem Zweig zusammengeführten Revisionen in einer Eigenschaft des Zweiges ab. Dies ermöglicht es, eine detaillierte Historie von bereits durchgeführten Integrationsschritten zu erhalten. Wenn Sie zum Beispiel eine neue Funktion in einem Zweig entwickeln und die fertige Entwicklung im Stamm zusammenführen, wird das Log für den Stamm nur eine Revision anzeigen, obwohl darin vielleicht 1000 Revisionen des Zweiges enthalten sind." #. (title) #: ../source/TortoiseGit_en.xml:5999 @@ -5260,8 +5260,8 @@ msgstr "Manchmal ist es notwendig, eine Logmeldung nachträglich zu ändern. Sei #. (para) #: ../source/TortoiseGit_en.xml:6031 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." -msgstr "Subversion lässt Sie beides, Logmeldungen und den Autor einer Revision, ändern. Aber da solche Änderungen nicht wieder rückgängig gemacht werden können (diese Änderungen werden nicht aufgezeichnet) ist diese Funktion standardmäßig deaktiviert. Um diese Funktion zu aktivieren, müssen Sie eine pre-revprop-change Aktion für das Projektarchiv einrichten. Bitte lesen Sie dazu im Kapitel Hook Scripts des Subversion Buchs nach, wie das gemacht wird. Lesen Sie auch , um mehr Informationen über das Einrichten von Aktionen auf einem Windows PC zu erhalten." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgstr "Git lässt Sie beides, Logmeldungen und den Autor einer Revision, ändern. Aber da solche Änderungen nicht wieder rückgängig gemacht werden können (diese Änderungen werden nicht aufgezeichnet) ist diese Funktion standardmäßig deaktiviert. Um diese Funktion zu aktivieren, müssen Sie eine pre-revprop-change Aktion für das Projektarchiv einrichten. Bitte lesen Sie dazu im Kapitel Hook Scripts des Git Buchs nach, wie das gemacht wird. Lesen Sie auch , um mehr Informationen über das Einrichten von Aktionen auf einem Windows PC zu erhalten." #. (para) #: ../source/TortoiseGit_en.xml:6044 @@ -5270,8 +5270,8 @@ msgstr "Sobald Sie die gewünschten Aktionen für das Projektarchiv eingerichtet #. (para) #: ../source/TortoiseGit_en.xml:6051 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." -msgstr "Da die Revisionseigenschaften (z.B. svn:log für Logmeldungen) in Subversion nicht aufgezeichnet werden, überschreiben Änderungen den alten Wert für immer." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgstr "Da die Revisionseigenschaften (z.B. svn:log für Logmeldungen) in Git nicht aufgezeichnet werden, überschreiben Änderungen den alten Wert für immer." #. (title) #: ../source/TortoiseGit_en.xml:6061 @@ -5320,8 +5320,8 @@ msgstr "Keine Log-Formatierung im Projektarchivbetrachter" #. (para) #: ../source/TortoiseGit_en.xml:6119 -msgid "Because the formatting depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." -msgstr "Da die Formatierung vom Zugriff auf Subversion Eigenschaften abhängt, sehen Sie die Ergebnisse nur in einer Arbeitskopie. Im Projektarchivbetrachter steht diese Funktion nicht zur Verfügung, weil das Holen der Eigenschaften von einem Server eine zeitintensive Operation list." +msgid "Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgstr "Da die Formatierung vom Zugriff auf Git Eigenschaften abhängt, sehen Sie die Ergebnisse nur in einer Arbeitskopie. Im Projektarchivbetrachter steht diese Funktion nicht zur Verfügung, weil das Holen der Eigenschaften von einem Server eine zeitintensive Operation list." #. (title) #: ../source/TortoiseGit_en.xml:6129 @@ -5539,8 +5539,8 @@ msgstr "Unterschiede zwischen Arbeitskopie Datei/Ordner und URL" #. (para) #: ../source/TortoiseGit_en.xml:6382 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." -msgstr "Wenn Sie die Unterschiede zwischen einer Datei in der Arbeitskopie und einer Datei im Subversion Projektarchiv sehen möchten, können sie das erreichen, indem Sie die Umsch Taste drücken, während sie einen Rechtsklick auf die Datei machen. Wählen sie dann TortoiseGit Vergleichen mit URL . Sie können diese Aktion ebenso für einen Ordner in der Arbeitskopie durchführen. TortoiseMerge wird Ihnen die Unterschiede wie eine Patchdatei anzeigen - eine Liste von Dateien, die Sie einzeln betrachten können." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgstr "Wenn Sie die Unterschiede zwischen einer Datei in der Arbeitskopie und einer Datei im Git Projektarchiv sehen möchten, können sie das erreichen, indem Sie die Umsch Taste drücken, während sie einen Rechtsklick auf die Datei machen. Wählen sie dann TortoiseGit Vergleichen mit URL . Sie können diese Aktion ebenso für einen Ordner in der Arbeitskopie durchführen. TortoiseMerge wird Ihnen die Unterschiede wie eine Patchdatei anzeigen - eine Liste von Dateien, die Sie einzeln betrachten können." #. (term) #: ../source/TortoiseGit_en.xml:6400 @@ -5934,8 +5934,8 @@ msgstr "markieren" #. (para) #: ../source/TortoiseGit_en.xml:6826 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." -msgstr "Es kommt sicher häufiger vor, dass sich einige benötigte Dateien bereits an einer anderen Stelle in Ihrem Projektarchiv befinden und Sie diese einfach an den richtigen Ort kopieren wollen. Sie könnten die Dateien einfach herüberkopieren und, wie oben beschrieben, hinzufügen. Aber dabei würde die Historie der Datei verloren gehen. Wenn Sie später einen Fehler beseitigen, können Sie diese Änderungen nur dann automatisch zusammenführen, wenn die neue Datei mit dem Original in Subversion verbunden ist." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." +msgstr "Es kommt sicher häufiger vor, dass sich einige benötigte Dateien bereits an einer anderen Stelle in Ihrem Projektarchiv befinden und Sie diese einfach an den richtigen Ort kopieren wollen. Sie könnten die Dateien einfach herüberkopieren und, wie oben beschrieben, hinzufügen. Aber dabei würde die Historie der Datei verloren gehen. Wenn Sie später einen Fehler beseitigen, können Sie diese Änderungen nur dann automatisch zusammenführen, wenn die neue Datei mit dem Original in Git verbunden ist." #. (para) #: ../source/TortoiseGit_en.xml:6834 @@ -6019,8 +6019,8 @@ msgstr "Die globale ignorieren Liste" #. (para) #: ../source/TortoiseGit_en.xml:6958 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." -msgstr "Eine weitere Möglichkeit Dateien zu ignorieren ist, diese in die globale ignorieren Liste einzutragen. Der große Unterschied besteht darin, dass die globale Liste eine Client Eigenschaft ist. Sie gilt für alle Subversion Projekte, aber nur auf dem jeweiligen Anwender PC. Im allgemeinen ist es besser, die svn:ignore Eigenschaft zu verwenden, weil diese für einzelne Projektbereiche gesetzt werden kann und weil sie für jeden, der das Projekt auscheckt, gültig ist. Lesen Sie für weitere Information." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgstr "Eine weitere Möglichkeit Dateien zu ignorieren ist, diese in die globale ignorieren Liste einzutragen. Der große Unterschied besteht darin, dass die globale Liste eine Client Eigenschaft ist. Sie gilt für alle Git Projekte, aber nur auf dem jeweiligen Anwender PC. Im allgemeinen ist es besser, die svn:ignore Eigenschaft zu verwenden, weil diese für einzelne Projektbereiche gesetzt werden kann und weil sie für jeden, der das Projekt auscheckt, gültig ist. Lesen Sie für weitere Information." #. (title) #: ../source/TortoiseGit_en.xml:6971 @@ -6029,8 +6029,8 @@ msgstr "Versionierte Objekte ignorieren" #. (para) #: ../source/TortoiseGit_en.xml:6972 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." -msgstr "Versionierte Dateien und Ordner können niemals ignoriert werden - das ist eine Eigenschaft von Subversion. Wenn Sie versehentlich eine Datei zur Versionskontrolle hinzugefügt haben, lesen Sie , um zu erfahren, wie Sie das rückgängig machen können." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." +msgstr "Versionierte Dateien und Ordner können niemals ignoriert werden - das ist eine Eigenschaft von Git. Wenn Sie versehentlich eine Datei zur Versionskontrolle hinzugefügt haben, lesen Sie , um zu erfahren, wie Sie das rückgängig machen können." #. (title) #: ../source/TortoiseGit_en.xml:6980 @@ -6079,8 +6079,8 @@ msgstr "Steht für eines der Zeichen innerhalb der eckigen Klammern. Zwei durch #. (para) #: ../source/TortoiseGit_en.xml:6987 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " -msgstr "Die Ausschluss-Muster von Subversion verwenden Platzhalter, eine Technik die ursprünglich aus der Unix Welt stammt, um Dateien oder Ordner zu spezifizieren. Folgende Zeichen haben eine besondere Bedeutung: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgstr "Die Ausschluss-Muster von Git verwenden Platzhalter, eine Technik die ursprünglich aus der Unix Welt stammt, um Dateien oder Ordner zu spezifizieren. Folgende Zeichen haben eine besondere Bedeutung: " #. (para) #: ../source/TortoiseGit_en.xml:7027 @@ -6114,8 +6114,8 @@ msgstr "Explorer Kontextmenü für Dateien unter Versionskontrolle" #. (para) #: ../source/TortoiseGit_en.xml:7062 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " -msgstr "Im Gegensatz zu CVS erlaubt es Subversion, Dateien und Ordner umzubenennen oder zu verschieben. Deshalb gibt es im Kontextmenü Befehle für diese Operationen. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgstr "Im Gegensatz zu CVS erlaubt es Git, Dateien und Ordner umzubenennen oder zu verschieben. Deshalb gibt es im Kontextmenü Befehle für diese Operationen. " #. (title) #: ../source/TortoiseGit_en.xml:7072 @@ -6134,7 +6134,7 @@ msgstr "Entfernen" #. (para) #: ../source/TortoiseGit_en.xml:7079 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "Verwenden Sie TortoiseGit Löschen , um Dateien oder Ordner aus der Versionskontrolle zu entfernen." #. (para) @@ -6144,8 +6144,8 @@ msgstr "Wenn Sie mittels TortoiseGit TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." -msgstr "Wenn Sie mittels TortoiseGit Löschen einen Ordner löschen, bleibt dieser in der Arbeitskopie, wird aber durch das Gelöscht Symbol gekennzeichnet.Solange Sie die Löschung noch nicht übertragen haben, können Sie die Datei mit dem TortoiseGit Rückgängig... Befehl auf dem Ordner selbst wieder herstellen. Dieses unterschiedliche Verhalten beim Löschen von Dateien und Ordnern ist Teil von Subversion, nicht von TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." +msgstr "Wenn Sie mittels TortoiseGit Löschen einen Ordner löschen, bleibt dieser in der Arbeitskopie, wird aber durch das Gelöscht Symbol gekennzeichnet.Solange Sie die Löschung noch nicht übertragen haben, können Sie die Datei mit dem TortoiseGit Rückgängig... Befehl auf dem Ordner selbst wieder herstellen. Dieses unterschiedliche Verhalten beim Löschen von Dateien und Ordnern ist Teil von Git, nicht von TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:7120 @@ -6154,13 +6154,13 @@ msgstr "Wenn Sie eine Datei oder einen Ordner aus dem Projektarchiv löschen, ab #. (para) #: ../source/TortoiseGit_en.xml:7131 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." -msgstr "Wenn eine Datei über den Explorer anstelle des TortoiseGit Menüs gelöscht wird, zeigt Ihnen der Übertragen-Dialog die fehlenden Dateien an und erlaubt Ihnen, diese aus der Versionskontrolle zu entfernen. Wenn Sie allerdings vorher Ihre Arbeitskopie aktualisieren, wird Subversion die fehlenden Dateien bemerken und durch die aktuelle Version aus dem Projektarchiv ersetzen. Wenn Sie ein Objekt, das sich in der Versionskontrolle befindet, löschen wollen, müssen Sie dazu TortoiseGit Löschen verwenden, damit Subversion nicht raten muss, was Sie wirklich tun wollten." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." +msgstr "Wenn eine Datei über den Explorer anstelle des TortoiseGit Menüs gelöscht wird, zeigt Ihnen der Übertragen-Dialog die fehlenden Dateien an und erlaubt Ihnen, diese aus der Versionskontrolle zu entfernen. Wenn Sie allerdings vorher Ihre Arbeitskopie aktualisieren, wird Git die fehlenden Dateien bemerken und durch die aktuelle Version aus dem Projektarchiv ersetzen. Wenn Sie ein Objekt, das sich in der Versionskontrolle befindet, löschen wollen, müssen Sie dazu TortoiseGit Löschen verwenden, damit Git nicht raten muss, was Sie wirklich tun wollten." #. (para) #: ../source/TortoiseGit_en.xml:7145 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." -msgstr "Wenn ein Ordner über den Explorer anstelle des TortoiseGit Menüs gelöscht wird, beschädigt das Ihre Arbeitskopie und sie können diese nicht mehr übertragen. Wenn Sie Ihre Arbeitskopie aktualisieren, wird Subversion den fehlenden Ordner wieder durch die neueste Version aus dem Projektarchiv ersetzen. Sie können den Ordner dann auf die korrekte Art mittels TortoiseGit Löschen entfernen." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgstr "Wenn ein Ordner über den Explorer anstelle des TortoiseGit Menüs gelöscht wird, beschädigt das Ihre Arbeitskopie und sie können diese nicht mehr übertragen. Wenn Sie Ihre Arbeitskopie aktualisieren, wird Git den fehlenden Ordner wieder durch die neueste Version aus dem Projektarchiv ersetzen. Sie können den Ordner dann auf die korrekte Art mittels TortoiseGit Löschen entfernen." #. (title) #: ../source/TortoiseGit_en.xml:7158 @@ -6253,13 +6253,13 @@ msgstr "Groß-/Kleinschreibung" #. (para) #: ../source/TortoiseGit_en.xml:7274 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." -msgstr "Die Groß-/Kleinschreibung eines Dateinamens mit Subversion unter Windows zu ändern ist trickreich, weil während einer kurzen Zeitspanne während des Umbenennens die Datei in beiden Schreibweisen existieren muss. Da Windows die Groß-/Kleinschreibung ignoriert, gibt es Konflikte beim Verwenden des normalen Umbenennen Befehls." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgstr "Die Groß-/Kleinschreibung eines Dateinamens mit Git unter Windows zu ändern ist trickreich, weil während einer kurzen Zeitspanne während des Umbenennens die Datei in beiden Schreibweisen existieren muss. Da Windows die Groß-/Kleinschreibung ignoriert, gibt es Konflikte beim Verwenden des normalen Umbenennen Befehls." #. (para) #: ../source/TortoiseGit_en.xml:7280 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" -msgstr "Glücklicherweise gibt es (mindestens) zwei Lösungen, eine Datei umzubenennen ohne die Historie zu verlieren. Es ist wichtig, die Datei mit Subversion umzubenennen. Ein Umbenennen nur im Explorer wird die Arbeitskopie beschädigen!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" +msgstr "Glücklicherweise gibt es (mindestens) zwei Lösungen, eine Datei umzubenennen ohne die Historie zu verlieren. Es ist wichtig, die Datei mit Git umzubenennen. Ein Umbenennen nur im Explorer wird die Arbeitskopie beschädigen!" #. (para) #: ../source/TortoiseGit_en.xml:7290 @@ -6310,8 +6310,8 @@ msgstr "Behandeln von Konflikten in der Groß-/Kleinschreibung" #. (para) #: ../source/TortoiseGit_en.xml:7336 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." -msgstr "Wenn das Projektarchiv bereits zwei Dateien mit demselben Namen aber unterschiedlicher Groß-/Kleinschreibung (z.B. TEST.TXT und test.txt) enthält, können Sie diesen Ordner unter Windows nicht mehr aktualisieren oder auschecken. Während Subversion bei Dateinamen Groß-/Kleinschreibung beachtet, wird sie von Windows ignoriert." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." +msgstr "Wenn das Projektarchiv bereits zwei Dateien mit demselben Namen aber unterschiedlicher Groß-/Kleinschreibung (z.B. TEST.TXT und test.txt) enthält, können Sie diesen Ordner unter Windows nicht mehr aktualisieren oder auschecken. Während Git bei Dateinamen Groß-/Kleinschreibung beachtet, wird sie von Windows ignoriert." #. (para) #: ../source/TortoiseGit_en.xml:7344 @@ -6340,13 +6340,13 @@ msgstr "Externes Umbenennen reparieren" #. (para) #: ../source/TortoiseGit_en.xml:7368 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." -msgstr "Manchmal wird Ihre freundliche Entwicklungsumgebung beim Umarbeiten von Projekten Dateien für Sie umbenennen und Subversion nicht davon in Kenntnis setzen. Wenn Sie dann Ihre Änderungen übertragen wollen, zeigt Ihnen Subversion die alte Datei als fehlend und die neue als nicht versioniert an. Sie könnten jetzt einfach die neue Datei übertragen, aber Sie würden dadurch die Historie der Datei verlieren, da Subversion nicht weiß, dass die beiden Dateien zusammenhängen." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." +msgstr "Manchmal wird Ihre freundliche Entwicklungsumgebung beim Umarbeiten von Projekten Dateien für Sie umbenennen und Git nicht davon in Kenntnis setzen. Wenn Sie dann Ihre Änderungen übertragen wollen, zeigt Ihnen Git die alte Datei als fehlend und die neue als nicht versioniert an. Sie könnten jetzt einfach die neue Datei übertragen, aber Sie würden dadurch die Historie der Datei verlieren, da Git nicht weiß, dass die beiden Dateien zusammenhängen." #. (para) #: ../source/TortoiseGit_en.xml:7376 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Besser ist es, wenn Sie Subversion mitteilen, dass diese Änderung eigentlich eine Umbenennung war. Sie können das in den Übertragen- und Auf Änderung prüfen-Dialogen tun. Markieren Sie einfach beide, die alte (fehlende) und die neue (unversionierte) Datei und wählen Sie Kontextmenü Umbenennen reparieren, um die beiden Dateien zu einer Umbenennung zusammenzufassen." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Besser ist es, wenn Sie Git mitteilen, dass diese Änderung eigentlich eine Umbenennung war. Sie können das in den Übertragen- und Auf Änderung prüfen-Dialogen tun. Markieren Sie einfach beide, die alte (fehlende) und die neue (unversionierte) Datei und wählen Sie Kontextmenü Umbenennen reparieren, um die beiden Dateien zu einer Umbenennung zusammenzufassen." #. (title) #: ../source/TortoiseGit_en.xml:7390 @@ -6355,7 +6355,7 @@ msgstr "Nicht versionierte Dateien löschen" #. (para) #: ../source/TortoiseGit_en.xml:7391 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." msgstr "Meistens tragen Sie in Ihre Ignorieren-Liste sämtliche generierten Dateien ein, da diese normalerweise von der Versionierung ausgeschlossen werden sollen. Aber was ist, wenn Sie all diese ignorierten Dateien löschen wollen, um Ihr Projekt sauber generieren zu können? Meistens gibt es eine entsprechende Funktion im Makefile, aber falls es noch kein Makefile gibt oder dieses gerade überarbeitet wird wäre es nützlich, eine Funktion zum Bereinigen der Arbeitskopie zu haben." #. (para) @@ -6450,13 +6450,13 @@ msgstr "Aufräumen" #. (para) #: ../source/TortoiseGit_en.xml:7493 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." -msgstr "Wenn ein Subversion Befehl, vielleicht durch ein Serverproblem, nicht erfolgreich abgeschlossen werden konnte, kann die Arbeitskopie in einem inkonsistenten Zustand zurückgelassen werden. In diesem Fall müssen Sie TortoiseGit Arbeitskopie aufräumen auf dem Ordner ausführen. Am besten tun Sie das auf dem obersten Ordner Ihrer Arbeitskopie." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgstr "Wenn ein Git Befehl, vielleicht durch ein Serverproblem, nicht erfolgreich abgeschlossen werden konnte, kann die Arbeitskopie in einem inkonsistenten Zustand zurückgelassen werden. In diesem Fall müssen Sie TortoiseGit Arbeitskopie aufräumen auf dem Ordner ausführen. Am besten tun Sie das auf dem obersten Ordner Ihrer Arbeitskopie." #. (para) #: ../source/TortoiseGit_en.xml:7504 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." -msgstr "Aufräumen hat einen nützlichen Nebeneffekt. Falls ein Dateidatum geändert wurde, aber der Inhalt der Datei dennoch gleich geblieben ist, kann Subversion nicht gleich feststellen ob sich die Datei geändert hat, sondern muss dann die Datei Byte für Byte mit der Basiskopie der Datei vergleichen. Wenn Sie eine Menge solcher Dateien haben, benötigt das Ermitteln des Subversion Status mehr Zeit, was viele Dialoge/Befehle sehr verlangsamt. Ein Ausführen des Bereinigen-Befehls repariert diese falschen Zeitstempel wieder und stellt die volle Geschwindigkeit der Statusprüfung wieder her." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgstr "Aufräumen hat einen nützlichen Nebeneffekt. Falls ein Dateidatum geändert wurde, aber der Inhalt der Datei dennoch gleich geblieben ist, kann Git nicht gleich feststellen ob sich die Datei geändert hat, sondern muss dann die Datei Byte für Byte mit der Basiskopie der Datei vergleichen. Wenn Sie eine Menge solcher Dateien haben, benötigt das Ermitteln des Git Status mehr Zeit, was viele Dialoge/Befehle sehr verlangsamt. Ein Ausführen des Bereinigen-Befehls repariert diese falschen Zeitstempel wieder und stellt die volle Geschwindigkeit der Statusprüfung wieder her." #. (title) #: ../source/TortoiseGit_en.xml:7515 @@ -6465,8 +6465,8 @@ msgstr "Nutze Übertragungs-Zeitstempel" #. (para) #: ../source/TortoiseGit_en.xml:7516 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." -msgstr "Einige frühere Versionen von Subversion hatten einen Fehler, welcher die Zeitstempel der Dateien falsch gesetzt hat, wenn Sie ein Projekt mit Dateidatum auf Datum der letzten Übertragung setzen benutzt haben. Führen Sie den Aufräumen-Befehl aus, um die Arbeitskopie mit korrekten Datei-Zeitstempeln zu versehen und damit die Geschwindigkeit von Subversion-Befehlen zu erhöhen." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgstr "Einige frühere Versionen von Git hatten einen Fehler, welcher die Zeitstempel der Dateien falsch gesetzt hat, wenn Sie ein Projekt mit Dateidatum auf Datum der letzten Übertragung setzen benutzt haben. Führen Sie den Aufräumen-Befehl aus, um die Arbeitskopie mit korrekten Datei-Zeitstempeln zu versehen und damit die Geschwindigkeit von Git-Befehlen zu erhöhen." #. (title) #: ../source/TortoiseGit_en.xml:7526 @@ -6480,38 +6480,38 @@ msgstr "Eigenschaften" #. (title) #: ../source/TortoiseGit_en.xml:7532 -msgid "Explorer property page, Subversion tab" -msgstr "Explorer Eigenschaftsseite, Subversion Tab" +msgid "Explorer property page, Git tab" +msgstr "Explorer Eigenschaftsseite, Git Tab" #. (para) #: ../source/TortoiseGit_en.xml:7530 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." -msgstr "Manchmal ist es notwendig, detailliertere Informationen über eine Datei oder einen Ordner zu haben als dies mit den überlagerten Symbolen möglich ist. Sie können diese zusätzlichen Informationen über den Eigenschaftsdialog des Explorers anzeigen. Wählen Sie dazu die Datei oder den Ordner aus, öffnen Sie das Kontextmenü mit der rechten Maustaste und wählen Sie den Eintrag Windows Menü Eigenschaften aus. (Beachten Sie: dies ist der normale Eintrag im Kontextmenü des Explorers und nicht der Eintrag im TortoiseGit Untermenü!). Im darauf folgenden Dialog hat TortoiseGit einen Karteireiter für Dateien/Ordner unter Subversionkontrolle angelegt, auf dem Sie alle Informationen finden." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." +msgstr "Manchmal ist es notwendig, detailliertere Informationen über eine Datei oder einen Ordner zu haben als dies mit den überlagerten Symbolen möglich ist. Sie können diese zusätzlichen Informationen über den Eigenschaftsdialog des Explorers anzeigen. Wählen Sie dazu die Datei oder den Ordner aus, öffnen Sie das Kontextmenü mit der rechten Maustaste und wählen Sie den Eintrag Windows Menü Eigenschaften aus. (Beachten Sie: dies ist der normale Eintrag im Kontextmenü des Explorers und nicht der Eintrag im TortoiseGit Untermenü!). Im darauf folgenden Dialog hat TortoiseGit einen Karteireiter für Dateien/Ordner unter Gitkontrolle angelegt, auf dem Sie alle Informationen finden." #. (title) #: ../source/TortoiseGit_en.xml:7552 -msgid "Subversion Properties" -msgstr "Subversion Eigenschaften" +msgid "Git Properties" +msgstr "Git Eigenschaften" #. (primary) #: ../source/TortoiseGit_en.xml:7554 -msgid "Subversion properties" -msgstr "Subversion Eigenschaften" +msgid "Git properties" +msgstr "Git Eigenschaften" #. (title) #: ../source/TortoiseGit_en.xml:7560 -msgid "Subversion property page" -msgstr "Subversion Eigenschaftsseite" +msgid "Git property page" +msgstr "Git Eigenschaftsseite" #. (para) #: ../source/TortoiseGit_en.xml:7558 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." -msgstr "Sie können die Subversion Eigenschaften sowohl im Windows Eigenschaftendialog als auch im Kontextmenü mit TortoiseGit Eigenschaften und in Statuslisten mit Kontextmenü Eigenschaften anzeigen und verändern." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgstr "Sie können die Git Eigenschaften sowohl im Windows Eigenschaftendialog als auch im Kontextmenü mit TortoiseGit Eigenschaften und in Statuslisten mit Kontextmenü Eigenschaften anzeigen und verändern." #. (para) #: ../source/TortoiseGit_en.xml:7575 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." -msgstr "Sie können Ihre eigenen Eigenschaften oder Subversion Eigenschaften hinzufügen. Diese beginnen alle mit svn:. svn:externals ist solch eine Eigenschaft. Sehen Sie sich das Kapitel an, um mehr über das Thema zu erfahren." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgstr "Sie können Ihre eigenen Eigenschaften oder Git Eigenschaften hinzufügen. Diese beginnen alle mit svn:. svn:externals ist solch eine Eigenschaft. Sehen Sie sich das Kapitel an, um mehr über das Thema zu erfahren." #. (title) #: ../source/TortoiseGit_en.xml:7582 @@ -6555,18 +6555,18 @@ msgstr "Eine komprimierte Version der vorherigen drei Schlüsselwörter" #. (para) #: ../source/TortoiseGit_en.xml:7589 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " -msgstr "Subversion unterstützt eine CVS-ähnliche Expansion von Schlüsselwörtern, die dazu genutzt werden kann, Dateinamen und Revisionsinformationen in der Datei selbst einzubetten. Die derzeit unterstützten Schlüsselwörter sind: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgstr "Git unterstützt eine CVS-ähnliche Expansion von Schlüsselwörtern, die dazu genutzt werden kann, Dateinamen und Revisionsinformationen in der Datei selbst einzubetten. Die derzeit unterstützten Schlüsselwörter sind: " #. (para) #: ../source/TortoiseGit_en.xml:7640 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." -msgstr "Um mehr über diese Schlüsselwörter herauszufinden, lesen Sie den Abschnitt svn:keywords im Subversion Buch, in dem die Schlüsselwörter und ihre Anwendung im Detail beschrieben werden." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." +msgstr "Um mehr über diese Schlüsselwörter herauszufinden, lesen Sie den Abschnitt svn:keywords im Git Buch, in dem die Schlüsselwörter und ihre Anwendung im Detail beschrieben werden." #. (para) #: ../source/TortoiseGit_en.xml:7650 -msgid "For more information about properties in Subversion see the Special Properties." -msgstr "Um mehr Informationen über Eigenschaften in Subversion zu erhalten, schauen Sie sich das entsprechende Kapitel Special Properties im Subversion Buch an." +msgid "For more information about properties in Git see the Special Properties." +msgstr "Um mehr Informationen über Eigenschaften in Git zu erhalten, schauen Sie sich das entsprechende Kapitel Special Properties im Git Buch an." #. (title) #: ../source/TortoiseGit_en.xml:7657 @@ -6656,7 +6656,7 @@ msgstr "TortoiseGit kann binäre Eigenschaften mittels Dateien handhaben. Um ein #. (para) #: ../source/TortoiseGit_en.xml:7756 msgid "Although binary properties are not often used, they can be useful in some applications. For example if you are storing huge graphics files, or if the application used to load the file is huge, you might want to store a thumbnail as a property so you can obtain a preview quickly." -msgstr "Obwohl binäre Eigenschaften nicht häufig verwendet werden, sind sie doch in manchen Fällen nützlich. Sie können zum Beispiel die Vorschau einer großen Grafikdatei als binäre Eigenschaft in Subversion speichern, um sich schnell einen Eindruck des Bildes verschaffen zu können." +msgstr "Obwohl binäre Eigenschaften nicht häufig verwendet werden, sind sie doch in manchen Fällen nützlich. Sie können zum Beispiel die Vorschau einer großen Grafikdatei als binäre Eigenschaft in Git speichern, um sich schnell einen Eindruck des Bildes verschaffen zu können." #. (title) #: ../source/TortoiseGit_en.xml:7764 @@ -6670,13 +6670,13 @@ msgstr "auto-props" #. (para) #: ../source/TortoiseGit_en.xml:7768 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." -msgstr "Sie können Subversion so einrichten, dass Eigenschaften für Dateien und Ordner automatisch gesetzt werden, wenn Sie zum Projektarchiv hinzugefügt werden. Es gibt zwei verschiedene Wege dazu." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgstr "Sie können Git so einrichten, dass Eigenschaften für Dateien und Ordner automatisch gesetzt werden, wenn Sie zum Projektarchiv hinzugefügt werden. Es gibt zwei verschiedene Wege dazu." #. (para) #: ../source/TortoiseGit_en.xml:7773 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." -msgstr "Sie können die Subversion Konfigurationsdatei bearbeiten, um diese Funktion auf dem Client zu aktivieren. Auf der Allgemein Seite der TortoiseGit Einstellungen findet sich eine Bearbeiten Schaltfläche, die Sie direkt dort hinbringt. Die Konfigurationsdatei mit der einige Subversion Verhaltensweisen festgelegt werden ist eine einfache Textdatei. Sie müssen darin zwei Dinge ändern. Erstens müssen Sie in der miscellany Sektion die Zeile enable-auto-props = yes auskommentieren. Zweitens müssen Sie in dem darunterstehenden Bereich festlegen, welche Eigenschaften zu welchen Dateitypen hinzugefügt werden sollen. Dabei handelt es sich um eine Subversion Standardfunktion, die in jedem Subversion Client funktioniert. Allerdings müssen die Einstellungen auf jedem Computer vorgenommen werden. Es gibt keine Möglichkeit die Einstellungen über das Projektarchiv zu verbreiten." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgstr "Sie können die Git Konfigurationsdatei bearbeiten, um diese Funktion auf dem Client zu aktivieren. Auf der Allgemein Seite der TortoiseGit Einstellungen findet sich eine Bearbeiten Schaltfläche, die Sie direkt dort hinbringt. Die Konfigurationsdatei mit der einige Git Verhaltensweisen festgelegt werden ist eine einfache Textdatei. Sie müssen darin zwei Dinge ändern. Erstens müssen Sie in der miscellany Sektion die Zeile enable-auto-props = yes auskommentieren. Zweitens müssen Sie in dem darunterstehenden Bereich festlegen, welche Eigenschaften zu welchen Dateitypen hinzugefügt werden sollen. Dabei handelt es sich um eine Git Standardfunktion, die in jedem Git Client funktioniert. Allerdings müssen die Einstellungen auf jedem Computer vorgenommen werden. Es gibt keine Möglichkeit die Einstellungen über das Projektarchiv zu verbreiten." #. (para) #: ../source/TortoiseGit_en.xml:7790 @@ -6700,8 +6700,8 @@ msgstr "Übertrage Eigenschaften" #. (para) #: ../source/TortoiseGit_en.xml:7810 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." -msgstr "Subversion Eigenschaften sind auch unter Versionskontrolle. Nachdem Sie eine Eigenschaft geändert haben, müssen Sie die Änderungen zum Projektarchiv übertragen. " +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." +msgstr "Git Eigenschaften sind auch unter Versionskontrolle. Nachdem Sie eine Eigenschaft geändert haben, müssen Sie die Änderungen zum Projektarchiv übertragen. " #. (title) #: ../source/TortoiseGit_en.xml:7816 @@ -6710,8 +6710,8 @@ msgstr "Konflikte in Eigenschaften" #. (para) #: ../source/TortoiseGit_en.xml:7817 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." -msgstr "Sollte es beim Übertragen zum Server zu einem Konflikt kommen, weil ein anderer Benutzer die gleiche Eigenschaft geändert hat, generiert Subversion eine .prej Datei. Löschen Sie diese Datei, nachdem Sie den Konflikt aufgelöst haben. " +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." +msgstr "Sollte es beim Übertragen zum Server zu einem Konflikt kommen, weil ein anderer Benutzer die gleiche Eigenschaft geändert hat, generiert Git eine .prej Datei. Löschen Sie diese Datei, nachdem Sie den Konflikt aufgelöst haben. " #. (title) #: ../source/TortoiseGit_en.xml:7826 @@ -6750,8 +6750,8 @@ msgstr "tsvn:logtemplate wird für Projekte benutzt, die Rege #. (para) #: ../source/TortoiseGit_en.xml:7882 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." -msgstr "Subversion erlaubt Ihnen, autoprops anzugeben, die für jede neu hinzugefügte oder importierte Datei, abhängig von der Dateiendung, gesetzt werden. Das erfordert, dass jeder Client die gleichen autoprops in seiner Subversion Konfigurationsdatei stehen hat. tsvn:autoprops können auch auf Ordner gesetzt werden und werden mit den lokalen autoprops des Anwenders zusammengeführt, wenn Dateien zu einem Projektarchiv hinzugefügt oder importiert werden. Das Format ist dasselbe wie bei den Subversion autoprops, z.B. setzt *.sh = svn:eol-style=native;svn:executable zwei Eigenschaften auf Dateien mit der .sh Endung." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgstr "Git erlaubt Ihnen, autoprops anzugeben, die für jede neu hinzugefügte oder importierte Datei, abhängig von der Dateiendung, gesetzt werden. Das erfordert, dass jeder Client die gleichen autoprops in seiner Git Konfigurationsdatei stehen hat. tsvn:autoprops können auch auf Ordner gesetzt werden und werden mit den lokalen autoprops des Anwenders zusammengeführt, wenn Dateien zu einem Projektarchiv hinzugefügt oder importiert werden. Das Format ist dasselbe wie bei den Git autoprops, z.B. setzt *.sh = svn:eol-style=native;svn:executable zwei Eigenschaften auf Dateien mit der .sh Endung." #. (para) #: ../source/TortoiseGit_en.xml:7895 @@ -6808,7 +6808,7 @@ msgstr "Manche tsvn: Eigenschaften erfordern einen t #. (para) #: ../source/TortoiseGit_en.xml:7976 msgid "TortoiseGit can integrate with some bug tracking tools. This uses project properties that start with bugtraq:. Read for further information." -msgstr "TortoiseGit kann einige Fehlerverfolgungssysteme in Subversion integrieren. Dies geschieht über Eigenschaften, die mit bugtraq: beginnen. Wie Sie mit diesen Eigenschaften umgehen ist in erklärt. " +msgstr "TortoiseGit kann einige Fehlerverfolgungssysteme in Git integrieren. Dies geschieht über Eigenschaften, die mit bugtraq: beginnen. Wie Sie mit diesen Eigenschaften umgehen ist in erklärt. " #. (para) #: ../source/TortoiseGit_en.xml:7981 @@ -6837,8 +6837,8 @@ msgstr "Wenn Sie mit TortoiseGit neue Unterordner hinzufügen, werden sämtliche #. (para) #: ../source/TortoiseGit_en.xml:8015 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." -msgstr "Obwohl die TortoiseGit Projekteigenschaften sehr nützlich sind, gelten sie nur für TortoiseGit und einige von ihnen sogar nur für neuere Versionen von TortoiseGit. Sobald Projektmitarbeiter verschiedene Subversion Clients oder eventuell alte Versionen von TortoiseGit einsetzen, sollten Sie besser mit Aktionsskripten im Projektarchiv Projektregeln durchsetzen. Projekteigenschaften können nur beim Einrichten von Regeln helfen, jedoch nicht dabei, diese durchzusetzen." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgstr "Obwohl die TortoiseGit Projekteigenschaften sehr nützlich sind, gelten sie nur für TortoiseGit und einige von ihnen sogar nur für neuere Versionen von TortoiseGit. Sobald Projektmitarbeiter verschiedene Git Clients oder eventuell alte Versionen von TortoiseGit einsetzen, sollten Sie besser mit Aktionsskripten im Projektarchiv Projektregeln durchsetzen. Projekteigenschaften können nur beim Einrichten von Regeln helfen, jedoch nicht dabei, diese durchzusetzen." #. (title) #: ../source/TortoiseGit_en.xml:8028 @@ -6869,8 +6869,8 @@ msgstr "Eine andere wichtige Funktion ist die Möglichkeit, bestimmte Zustände #. (para) #: ../source/TortoiseGit_en.xml:8058 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." -msgstr "Subversion kennt keinen speziellen Befehl für das Verzweigen oder Markieren. Subversion benutzt stattdessen so genannte billige Kopien. Diese funktionieren ähnlich wie Verweise, d.h. es wird keine richtige Kopie erstellt sondern nur eine Verweis auf eine bestimmte Revision. Daraus ergibt sich, dass Zweige oder Marken schnell zu erstellen sind und nahezu keinen zusätzlichen Platz im Projektarchiv benötigen." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgstr "Git kennt keinen speziellen Befehl für das Verzweigen oder Markieren. Git benutzt stattdessen so genannte billige Kopien. Diese funktionieren ähnlich wie Verweise, d.h. es wird keine richtige Kopie erstellt sondern nur eine Verweis auf eine bestimmte Revision. Daraus ergibt sich, dass Zweige oder Marken schnell zu erstellen sind und nahezu keinen zusätzlichen Platz im Projektarchiv benötigen." #. (title) #: ../source/TortoiseGit_en.xml:8068 @@ -7016,8 +7016,8 @@ msgstr "Wenn Sie eine Arbeitskopie, die auf einem Zweig basiert verändern und d #. (para) #: ../source/TortoiseGit_en.xml:8245 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " -msgstr "Obwohl Subversion keine Unterscheidung zwischen tags und branches macht, werden sie normalerweise unterschiedlich genutzt. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgstr "Obwohl Git keine Unterscheidung zwischen tags und branches macht, werden sie normalerweise unterschiedlich genutzt. " #. (title) #: ../source/TortoiseGit_en.xml:8289 @@ -7042,8 +7042,8 @@ msgstr "Wenn Zweige für verschiedene Entwicklungslinien verwendet werden, werde #. (para) #: ../source/TortoiseGit_en.xml:8299 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." -msgstr "Es ist wichtig zu verstehen, wie Verzweigen und Zusammenführen in Subversion funktioniert bevor Sie es benutzen, denn es kann unter Umständen sehr komplex werden. Wir empfehlen Ihnen, das Kapitel Branching and Merging des Subversion Buchs zu lesen. Dieses Kapitel beschreibt ausführlich das Verzweigen und Zusammenführen und gibt auch einige Beispiele, wie man diese Werkzeuge am besten benutzt." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." +msgstr "Es ist wichtig zu verstehen, wie Verzweigen und Zusammenführen in Git funktioniert bevor Sie es benutzen, denn es kann unter Umständen sehr komplex werden. Wir empfehlen Ihnen, das Kapitel Branching and Merging des Git Buchs zu lesen. Dieses Kapitel beschreibt ausführlich das Verzweigen und Zusammenführen und gibt auch einige Beispiele, wie man diese Werkzeuge am besten benutzt." #. (para) #: ../source/TortoiseGit_en.xml:8309 @@ -7072,8 +7072,8 @@ msgstr "Diese Methode wird benutzt wenn Sie Änderungen an einem Zweig (branch) #. (para) #: ../source/TortoiseGit_en.xml:8342 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." -msgstr "Damit weisen Sie Subversion an, folgendes zu tun: Berechne die Änderungen, die nötig sind um von Revision X des Zweiges A zu Revision Y des Zweiges A zu gelangen und wende diese Änderungen auf meine Arbeitskopie (von Stamm oder Zweig B) an." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgstr "Damit weisen Sie Git an, folgendes zu tun: Berechne die Änderungen, die nötig sind um von Revision X des Zweiges A zu Revision Y des Zweiges A zu gelangen und wende diese Änderungen auf meine Arbeitskopie (von Stamm oder Zweig B) an." #. (term) #. (title) @@ -7084,12 +7084,12 @@ msgstr "Einen Zweig wieder Eingliedern" #. (para) #: ../source/TortoiseGit_en.xml:8353 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." -msgstr "Diese Methode behandelt den Fall dass Sie einen Funktionszweig, wie im Subversion Buch behandelt, angelegt haben. Alle Änderungen am Stamm wurden Woche für Woche mit dem Zweig zusammengeführt, und nun möchten Sie, da die Funktion im Zweig fertig ist, diese wieder im Stamm zusammenführen. Weil Sie den Funktionszweig immer mit dem Stamm synchronisiert haben, sind die letzten Versionen des Funktionszweiges und des Stammes, mit Ausnahme der auf dem Funktionszweig implementierten Neuerungen identisch." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgstr "Diese Methode behandelt den Fall dass Sie einen Funktionszweig, wie im Git Buch behandelt, angelegt haben. Alle Änderungen am Stamm wurden Woche für Woche mit dem Zweig zusammengeführt, und nun möchten Sie, da die Funktion im Zweig fertig ist, diese wieder im Stamm zusammenführen. Weil Sie den Funktionszweig immer mit dem Stamm synchronisiert haben, sind die letzten Versionen des Funktionszweiges und des Stammes, mit Ausnahme der auf dem Funktionszweig implementierten Neuerungen identisch." #. (para) #: ../source/TortoiseGit_en.xml:8362 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "Hierbei handelt es sich um einen Spezialfall des weiter unten beschriebenen Zusammenführens von Bäumen. Es wird als Quelle nur die URL des Entwicklungsszweiges benötigt. Die Funktion verwendet die Protokollierung der Datenintegration, um die korrekten Revisionsbereiche zu ermitteln und führt zusätzlich Überprüfungen durch ob der Zweig mit allen Änderungen aus dem Stamm zusammengeführt wurde. Dadurch wird sichergestellt, dass Sie nicht versehentlich Änderungen von anderen zurücknehmen, die seit Ihrer letzten Synchronisation mit dem Stamm übertragen wurden." #. (para) @@ -7109,13 +7109,13 @@ msgstr "Zusammenführen zweier Bäume" #. (para) #: ../source/TortoiseGit_en.xml:8392 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." -msgstr "Dies ist ein allgemeinerer Fall des wieder Eingliederns eines Zweiges. Damit weisen Sie Subversion an, folgendes zu tun: Berechne die Änderungen, die nötig sind um von der HEAD Revision des Stammes zur HEAD Revision des Zweiges zu gelangen und wende diese Änderungen auf meine Arbeitskopie (des Stammes) an. Das Ergebnis ist, dass der Stamm danach exakt wie der Zweig aussieht." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgstr "Dies ist ein allgemeinerer Fall des wieder Eingliederns eines Zweiges. Damit weisen Sie Git an, folgendes zu tun: Berechne die Änderungen, die nötig sind um von der HEAD Revision des Stammes zur HEAD Revision des Zweiges zu gelangen und wende diese Änderungen auf meine Arbeitskopie (des Stammes) an. Das Ergebnis ist, dass der Stamm danach exakt wie der Zweig aussieht." #. (para) #: ../source/TortoiseGit_en.xml:8400 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." -msgstr "Falls Ihr Server oder das Projektarchiv die Protokollierung der Datenintegration nicht unterstützen, ist das die einzige Methode mit der Sie einen Zweig in den Stamm zurückintegrieren können. Ein anderer Anwendungsfall tritt auf, wenn Sie mit Herstellerzweigen arbeiten und die Änderungen aufgrund einer neuen Auslieferung in Ihrem Stamm zusammenführen müssen. Für weiterführende Informationen lesen Sie bitte das Kapitel vendor branches im Subversion Buch." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." +msgstr "Falls Ihr Server oder das Projektarchiv die Protokollierung der Datenintegration nicht unterstützen, ist das die einzige Methode mit der Sie einen Zweig in den Stamm zurückintegrieren können. Ein anderer Anwendungsfall tritt auf, wenn Sie mit Herstellerzweigen arbeiten und die Änderungen aufgrund einer neuen Auslieferung in Ihrem Stamm zusammenführen müssen. Für weiterführende Informationen lesen Sie bitte das Kapitel vendor branches im Git Buch." #. (title) #: ../source/TortoiseGit_en.xml:8415 @@ -7159,8 +7159,8 @@ msgstr "Mit TortoiseGit legen Sie die zusammenzuführenden Änderungen als to find out more." -msgstr "Neuere Versionen von Subversion protokollieren die bisher durchgeführten Datenintegrationen mit. Deshalb müssen Sie sich nicht merken, welche Revisionen Sie bereits zusammengeführt haben. Wenn Sie den Revisionsbereich leer lassen, werden alle bisher noch nicht integrierten Revisionen ausgewählt. Lesen Sie in wie das funktioniert." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgstr "Neuere Versionen von Git protokollieren die bisher durchgeführten Datenintegrationen mit. Deshalb müssen Sie sich nicht merken, welche Revisionen Sie bereits zusammengeführt haben. Wenn Sie den Revisionsbereich leer lassen, werden alle bisher noch nicht integrierten Revisionen ausgewählt. Lesen Sie in wie das funktioniert." #. (para) #: ../source/TortoiseGit_en.xml:8516 @@ -7279,8 +7279,8 @@ msgstr "Sie können die Tiefe für das Zusammenführen festlegen, das heißt, wi #. (para) #: ../source/TortoiseGit_en.xml:8618 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" -msgstr "Meistens möchten Sie, dass die Vergangenheit von Dateien berücksichtigt wird, so dass Änderungen relativ zu einem gemeinsamen Vorgänger zusammengeführt werden. Manchmal möchten Sie aber auch Dateien zusammenführen, zwischen denen eine Beziehung besteht - allerdings nicht in Ihrem Projektarchiv. Sie haben zum Beispiel Versionen 1 und 2 einer externen Bibliothek in zwei verschiedene Verzeichnisse importiert. Obwohl zwischen diesen ein logischer Zusammenhang besteht, weiß Subversion nichts davon, weil es nur die separat importierten Dateibäume sieht. Wenn Sie versuchen, die Unterschiede zwischen den beiden Versionen zusammenzuführen, werden Sie ein vollständiges Entfernen gefolgt von einem vollständigen Hinzufügen erhalten. Damit Subversion nur pfadbasierte Differenzen anstelle von vergangenheitsbasierten Differenzen erzeugt, wählen Sie die Vorfahren ignorieren Option. Weitere Informationen zu diesem Thema finden Sie im Subversion Buch in Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" +msgstr "Meistens möchten Sie, dass die Vergangenheit von Dateien berücksichtigt wird, so dass Änderungen relativ zu einem gemeinsamen Vorgänger zusammengeführt werden. Manchmal möchten Sie aber auch Dateien zusammenführen, zwischen denen eine Beziehung besteht - allerdings nicht in Ihrem Projektarchiv. Sie haben zum Beispiel Versionen 1 und 2 einer externen Bibliothek in zwei verschiedene Verzeichnisse importiert. Obwohl zwischen diesen ein logischer Zusammenhang besteht, weiß Git nichts davon, weil es nur die separat importierten Dateibäume sieht. Wenn Sie versuchen, die Unterschiede zwischen den beiden Versionen zusammenzuführen, werden Sie ein vollständiges Entfernen gefolgt von einem vollständigen Hinzufügen erhalten. Damit Git nur pfadbasierte Differenzen anstelle von vergangenheitsbasierten Differenzen erzeugt, wählen Sie die Vorfahren ignorieren Option. Weitere Informationen zu diesem Thema finden Sie im Git Buch in Noticing or Ignoring Ancestry" #. (para) #: ../source/TortoiseGit_en.xml:8635 @@ -7314,13 +7314,13 @@ msgstr "Das Zusammenführen ist nun beendet. Es ist eine gute Idee, wenn Sie sic #. (para) #: ../source/TortoiseGit_en.xml:8679 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." -msgstr "Bei Subversion Clients vor Version 1.5 müssen Informationen über zusammengeführte Revisionen von Hand protokolliert werden. Wenn Sie die Änderungen überprüft haben und diese nun übertragen möchten, beachten Sie dass die Logmeldung dieser Übertragung immer die bereits zusammengeführten Revisionsnummern enthalten sollte. Wenn Sie später erneut Revisionen zusammenführen möchten/müssen werden Sie froh sein zu wissen, was alles Sie bereits zusammengeführt haben und was nicht. Denn wenn Sie eine Revision ein weiteres Mal zusammenführen, würde dies zwingend zu einem Konflikt führen. Für genauere Informationen lesen Sie bitte Best Practices for Merging im Subversion Buch." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." +msgstr "Bei Git Clients vor Version 1.5 müssen Informationen über zusammengeführte Revisionen von Hand protokolliert werden. Wenn Sie die Änderungen überprüft haben und diese nun übertragen möchten, beachten Sie dass die Logmeldung dieser Übertragung immer die bereits zusammengeführten Revisionsnummern enthalten sollte. Wenn Sie später erneut Revisionen zusammenführen möchten/müssen werden Sie froh sein zu wissen, was alles Sie bereits zusammengeführt haben und was nicht. Denn wenn Sie eine Revision ein weiteres Mal zusammenführen, würde dies zwingend zu einem Konflikt führen. Für genauere Informationen lesen Sie bitte Best Practices for Merging im Git Buch." #. (para) #: ../source/TortoiseGit_en.xml:8696 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." -msgstr "Wenn Ihr Server und alle Clients unter Subversion 1.5 oder neuer laufen, wird die Protokollierung der Datenintegration sämtliche zusammengeführten Revisionen aufzeichnen und verhindern, dass eine Revision mehr als einmal integriert wird. Das vereinfacht Ihre Arbeit ungemein, da sie nun jedes Mal den gesamten Revisionsbereich wählen können und sichergestellt ist, dass nur neue Revisionen wirklich zusammengeführt werden." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgstr "Wenn Ihr Server und alle Clients unter Git 1.5 oder neuer laufen, wird die Protokollierung der Datenintegration sämtliche zusammengeführten Revisionen aufzeichnen und verhindern, dass eine Revision mehr als einmal integriert wird. Das vereinfacht Ihre Arbeit ungemein, da sie nun jedes Mal den gesamten Revisionsbereich wählen können und sichergestellt ist, dass nur neue Revisionen wirklich zusammengeführt werden." #. (para) #: ../source/TortoiseGit_en.xml:8703 @@ -7334,8 +7334,8 @@ msgstr "Wenn Sie gerade einen Funktionszweig in den Stamm integriert haben, enth #. (para) #: ../source/TortoiseGit_en.xml:8718 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." -msgstr "Subversion kann keine Datei mit einem Ordner zusammenführen und umgekehrt - nur Ordner mit Ordner und Dateien mit Dateien können zusammengeführt werden. Wenn Sie auf eine Datei klicken um den Zusammenführen-Dialog zu öffnen, müssen Sie eine URL zu einer Datei angeben, wenn Sie auf einen Ordner klicken um den Zusammenführen-Dialog zu öffnen müssen Sie für den Vorgang eine URL zu einem Ordner angeben." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgstr "Git kann keine Datei mit einem Ordner zusammenführen und umgekehrt - nur Ordner mit Ordner und Dateien mit Dateien können zusammengeführt werden. Wenn Sie auf eine Datei klicken um den Zusammenführen-Dialog zu öffnen, müssen Sie eine URL zu einer Datei angeben, wenn Sie auf einen Ordner klicken um den Zusammenführen-Dialog zu öffnen müssen Sie für den Vorgang eine URL zu einem Ordner angeben." #. (title) #: ../source/TortoiseGit_en.xml:8728 @@ -7374,18 +7374,18 @@ msgstr "Sie können Revisionen als nicht zusammenführbar m #. (para) #: ../source/TortoiseGit_en.xml:8732 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " -msgstr "Mit Subversion 1.5 wurden Möglichkeiten zur Verfolgung der Datenintegration eingeführt. Wenn Sie Änderungen von einem Baum in einem anderen zusammenführen, werden die entsprechenden Revisionsnummern gespeichert. Diese Information kann für weitere Zwecke herangezogen werden. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgstr "Mit Git 1.5 wurden Möglichkeiten zur Verfolgung der Datenintegration eingeführt. Wenn Sie Änderungen von einem Baum in einem anderen zusammenführen, werden die entsprechenden Revisionsnummern gespeichert. Diese Information kann für weitere Zwecke herangezogen werden. " #. (para) #: ../source/TortoiseGit_en.xml:8774 msgid "Merge tracking information is stored in the svn:mergeinfo property by the client when it performs a merge. When the merge is committed the server stores that information in a database, and when you request merge, log or blame information, the server can respond appropriately. For the system to work properly you must ensure that the server, the repository and all clients are upgraded. Earlier clients will not store the svn:mergeinfo property and earlier servers will not provide the information requested by new clients." -msgstr "Die zusammengeführten Revisionen und Pfade werden durch den Subversion Client beim Zusammenführen in der svn:mergeinfo Eigenschaft abgespeichert. Sobald die Änderungen übertragen wurden, speichert der Server sie in einer Datenbank. Falls jetzt Logdaten, Annotierungen oder Zusammenführen angefordert werden, kann der Server entsprechend reagieren. Damit das System korrekt arbeitet, müssen Sie sicherstellen, dass der Server, das Projektarchiv und alle Clients aktualisiert werden. Ältere Clients füllen die svn:mergeinfo nicht aus und ältere Server beantworten die Anfragen neuerer Clients nicht." +msgstr "Die zusammengeführten Revisionen und Pfade werden durch den Git Client beim Zusammenführen in der svn:mergeinfo Eigenschaft abgespeichert. Sobald die Änderungen übertragen wurden, speichert der Server sie in einer Datenbank. Falls jetzt Logdaten, Annotierungen oder Zusammenführen angefordert werden, kann der Server entsprechend reagieren. Damit das System korrekt arbeitet, müssen Sie sicherstellen, dass der Server, das Projektarchiv und alle Clients aktualisiert werden. Ältere Clients füllen die svn:mergeinfo nicht aus und ältere Server beantworten die Anfragen neuerer Clients nicht." #. (para) #: ../source/TortoiseGit_en.xml:8784 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." -msgstr "Lesen Sie mehr über die Verfolgung der Datenintegration in Subversions Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." +msgstr "Lesen Sie mehr über die Verfolgung der Datenintegration in Gits Merge tracking documentation." #. (title) #: ../source/TortoiseGit_en.xml:8792 @@ -7499,18 +7499,18 @@ msgstr "Ihre Firma hat bisher immer ein sperrendes Versionskontrollsystem einges #. (para) #: ../source/TortoiseGit_en.xml:8918 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " -msgstr "Subversion funktioniert im Allgemeinen am besten ohne Sperren, da es den in besprochenen Ansatz verfolgt. Es gibt jedoch einige Fälle, in denen es erforderlich ist, Dateien zu sperren. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgstr "Git funktioniert im Allgemeinen am besten ohne Sperren, da es den in besprochenen Ansatz verfolgt. Es gibt jedoch einige Fälle, in denen es erforderlich ist, Dateien zu sperren. " #. (para) #: ../source/TortoiseGit_en.xml:8942 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." -msgstr "Zunächst müssen Sie sicherstellen, dass Ihr Subversion Server zumindest mit Version 1.2 arbeitet. Frühere Versionen unterstützen Sperren überhaupt nicht. Wenn Sie ausschließlich den file:// Zugriff nutzen, müssen nur Ihre Clients aktualisiert werden." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgstr "Zunächst müssen Sie sicherstellen, dass Ihr Git Server zumindest mit Version 1.2 arbeitet. Frühere Versionen unterstützen Sperren überhaupt nicht. Wenn Sie ausschließlich den file:// Zugriff nutzen, müssen nur Ihre Clients aktualisiert werden." #. (title) #: ../source/TortoiseGit_en.xml:8949 -msgid "How Locking Works in Subversion" -msgstr "Sperren von Dateien in Subversion" +msgid "How Locking Works in Git" +msgstr "Sperren von Dateien in Git" #. (para) #: ../source/TortoiseGit_en.xml:8950 @@ -7524,8 +7524,8 @@ msgstr "Wenn Sie für eine Datei Eine Sperre holen, könn #. (para) #: ../source/TortoiseGit_en.xml:8963 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." -msgstr "Andere Anwender werden nicht unbedingt wissen, dass Sie eine Datei gesperrt haben. Wenn sie nicht regelmäßig den Sperrstatus überprüfen, werden sie es frühestens merken, wenn ihre Übertragung fehlschlägt, was in den meisten Fällen nicht sehr nützlich ist. Damit es einfacher ist, Sperren zu verwalten, gibt es die neue svn:needs-lock Eigenschaft von Subversion. Wenn diese Eigenschaft (auf einen beliebigen Wert) gesetzt ist, wird beim Auschecken oder Aktualisieren die Datei in der Arbeitskopie mit einem Schreibschutz versehen, es sei denn die Arbeitskopie besitzt die Sperre für die Datei. Dies dient als Warnung, dass Sie die Datei nicht bearbeiten sollen, bevor Sie nicht die Sperre für die Datei besitzen. Dateien unter Versionskontrolle, die mit Schreibschutz versehen sind, erhalten von TortoiseGit ein überlagertes Symbol, das anzeigt, dass Sie erst eine Sperre holen müssen, bevor Sie die Datei bearbeiten." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgstr "Andere Anwender werden nicht unbedingt wissen, dass Sie eine Datei gesperrt haben. Wenn sie nicht regelmäßig den Sperrstatus überprüfen, werden sie es frühestens merken, wenn ihre Übertragung fehlschlägt, was in den meisten Fällen nicht sehr nützlich ist. Damit es einfacher ist, Sperren zu verwalten, gibt es die neue svn:needs-lock Eigenschaft von Git. Wenn diese Eigenschaft (auf einen beliebigen Wert) gesetzt ist, wird beim Auschecken oder Aktualisieren die Datei in der Arbeitskopie mit einem Schreibschutz versehen, es sei denn die Arbeitskopie besitzt die Sperre für die Datei. Dies dient als Warnung, dass Sie die Datei nicht bearbeiten sollen, bevor Sie nicht die Sperre für die Datei besitzen. Dateien unter Versionskontrolle, die mit Schreibschutz versehen sind, erhalten von TortoiseGit ein überlagertes Symbol, das anzeigt, dass Sie erst eine Sperre holen müssen, bevor Sie die Datei bearbeiten." #. (para) #: ../source/TortoiseGit_en.xml:8979 @@ -7534,8 +7534,8 @@ msgstr "Sperren gehören sowohl zu einer Arbeitskopie als auch zu einer Person. #. (para) #: ../source/TortoiseGit_en.xml:8985 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." -msgstr "Wenn einer Ihrer Kollegen eine Datei sperrt und in Urlaub geht, ohne die Sperre vorher freizugeben, was dann? Subversion bietet Ihnen eine Möglichkeit, Sperren auszuhebeln. Eine Sperre freizugeben, die jemand anders besitzt, wird auch Sperre aufbrechen genannt. Sich eine Sperre zu holen, die jemand anders besitzt, wird auch Sperre stehlen genannt. Selbstverständlich sollten Sie dies nicht leichtfertig tun, wenn Sie sich weiterhin mit Ihren Kollegen gut stellen wollen." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgstr "Wenn einer Ihrer Kollegen eine Datei sperrt und in Urlaub geht, ohne die Sperre vorher freizugeben, was dann? Git bietet Ihnen eine Möglichkeit, Sperren auszuhebeln. Eine Sperre freizugeben, die jemand anders besitzt, wird auch Sperre aufbrechen genannt. Sich eine Sperre zu holen, die jemand anders besitzt, wird auch Sperre stehlen genannt. Selbstverständlich sollten Sie dies nicht leichtfertig tun, wenn Sie sich weiterhin mit Ihren Kollegen gut stellen wollen." #. (para) #: ../source/TortoiseGit_en.xml:8995 @@ -7604,8 +7604,8 @@ msgstr "Vermeiden Sie es Sperren aufzubrechen oder zu stehlen" #. (para) #: ../source/TortoiseGit_en.xml:9086 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." -msgstr "Wenn Sie die Sperre eines Kollegen stehlen oder aufbrechen, ohne ihm dies mitzuteilen, können Sie doppelte Arbeit verursachen. Falls Sie mit nicht zusammenführbaren Dateien arbeiten und eine Sperre stehlen, kann derjenige der die Sperre vorher besaß Ihre Daten überschreiben, sobald Sie die Sperre freigeben. Subversion verliert zwar keine Daten, aber Sie haben den gegenseitigen Schutz bei de Zusammenarbeit, den Sperren bieten, verloren." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." +msgstr "Wenn Sie die Sperre eines Kollegen stehlen oder aufbrechen, ohne ihm dies mitzuteilen, können Sie doppelte Arbeit verursachen. Falls Sie mit nicht zusammenführbaren Dateien arbeiten und eine Sperre stehlen, kann derjenige der die Sperre vorher besaß Ihre Daten überschreiben, sobald Sie die Sperre freigeben. Git verliert zwar keine Daten, aber Sie haben den gegenseitigen Schutz bei de Zusammenarbeit, den Sperren bieten, verloren." #. (title) #: ../source/TortoiseGit_en.xml:9098 @@ -7619,8 +7619,8 @@ msgstr "Wie bereits erwähnt ist der einfachste Weg dazu, die svn:needs #. (para) #: ../source/TortoiseGit_en.xml:9109 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." -msgstr "Wenn Sie ein Entwicklungsverfahren nutzen, das stets Dateisperren erfordert, ist es einfacher Subversions auto-props Eigenschaft zu nutzen, um die Dateieigenschaften automatisch zu setzen, sobald Sie Dateien zum Projektarchiv hinzufügen. Lesen Sie für weitere Information." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgstr "Wenn Sie ein Entwicklungsverfahren nutzen, das stets Dateisperren erfordert, ist es einfacher Gits auto-props Eigenschaft zu nutzen, um die Dateieigenschaften automatisch zu setzen, sobald Sie Dateien zum Projektarchiv hinzufügen. Lesen Sie für weitere Information." #. (title) #: ../source/TortoiseGit_en.xml:9118 @@ -7629,8 +7629,8 @@ msgstr "Aktionsskripte für Sperren" #. (para) #: ../source/TortoiseGit_en.xml:9119 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." -msgstr "Wenn Sie ein neues Projektarchiv mit Subversion 1.2 anlegen, werden vier Schablonen für Aktionsskripte im hooks Verzeichnis des Projektarchivs angelegt. Diese Aktionsskripte werden aufgerufen, bevor und nachdem eine Sperre geholt, bzw. freigegeben wird." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgstr "Wenn Sie ein neues Projektarchiv mit Git 1.2 anlegen, werden vier Schablonen für Aktionsskripte im hooks Verzeichnis des Projektarchivs angelegt. Diese Aktionsskripte werden aufgerufen, bevor und nachdem eine Sperre geholt, bzw. freigegeben wird." #. (para) #: ../source/TortoiseGit_en.xml:9125 @@ -8298,8 +8298,8 @@ msgstr "Sie können auch die Änderungen der gewählten Revisionen in einer ande #. (para) #: ../source/TortoiseGit_en.xml:9967 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." -msgstr "Da Subversion nicht alle Informationen bereitstellt, ist ein gewisser Grad der Interpretation notwendig, was manchmal zu seltsamen Ergebnissen führen kann. Trotzdem sollte der Revisionsgraph für trunk/ normalerweise brauchbare Ergebnisse liefern." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgstr "Da Git nicht alle Informationen bereitstellt, ist ein gewisser Grad der Interpretation notwendig, was manchmal zu seltsamen Ergebnissen führen kann. Trotzdem sollte der Revisionsgraph für trunk/ normalerweise brauchbare Ergebnisse liefern." #. (para) #: ../source/TortoiseGit_en.xml:9977 @@ -8313,7 +8313,7 @@ msgstr "Falls Sie den Log-Puffer verwenden und denken, dass sich der Inhalt oder #. (title) #: ../source/TortoiseGit_en.xml:9996 -msgid "Exporting a Subversion Working Copy" +msgid "Exporting a Git Working Copy" msgstr "Eine Arbeitskopie exportieren" #. (primary) @@ -8368,8 +8368,8 @@ msgstr "Einzelne Dateien exportieren" #. (para) #: ../source/TortoiseGit_en.xml:10071 -msgid "The export dialog does not allow exporting single files, even though Subversion can." -msgstr "Aus dem Exportdialog heraus können keine einzelnen Dateien exportiert werden, obwohl Subversion dazu in der Lage ist." +msgid "The export dialog does not allow exporting single files, even though Git can." +msgstr "Aus dem Exportdialog heraus können keine einzelnen Dateien exportiert werden, obwohl Git dazu in der Lage ist." #. (para) #: ../source/TortoiseGit_en.xml:10075 @@ -8465,8 +8465,8 @@ msgstr "Dies ist eine sehr selten durchgeführte Aktion. De #. (para) #: ../source/TortoiseGit_en.xml:10171 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." -msgstr "Sie zu einem anderen Subversion Projektarchiv wechseln wollen. In diesem Fall sollten Sie eine frische Arbeitskopie auschecken." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." +msgstr "Sie zu einem anderen Git Projektarchiv wechseln wollen. In diesem Fall sollten Sie eine frische Arbeitskopie auschecken." #. (para) #: ../source/TortoiseGit_en.xml:10177 @@ -8510,7 +8510,7 @@ msgstr "bugtracker" #. (para) #: ../source/TortoiseGit_en.xml:10211 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." msgstr "Es ist in der Software Entwicklung üblich, Änderungen am Quellcode mit einer spezifischen ID in einem Fehlerverfolgungssystem zu verbinden. Dies wird meist mittels eines pre-commit Aktionsskripts im Projektarchiv erreicht, das vom Fehlerverfolgungssystem zur Verfügung gestellt wird und die Logmeldung einer Übertragung nach bestimmten Wörtern durchsucht. Dies ist jedoch sehr fehleranfällig, da der Benutzer sich merken muss wie die Logmeldung auszusehen hat damit das Aktionsskript dies auch richtig erkennen kann." #. (para) @@ -8541,7 +8541,7 @@ msgstr "Eintragsnummern in Logmeldungen einfügen" #. (para) #: ../source/TortoiseGit_en.xml:10247 msgid "You can integrate a bug tracking tool of your choice in TortoiseGit. To do this, you have to define some properties, which start with bugtraq:. They must be set on Folders: ()" -msgstr "Sie können ein Fehlerverfolgungssystem Ihrer Wahl in TortoiseGit einbinden. Dafür müssen Sie ein paar Subversion Eigenschaften definieren, die mit bugtraq: beginnen. Diese Eigenschaften müssen auf Ordner gesetzt werden: ()" +msgstr "Sie können ein Fehlerverfolgungssystem Ihrer Wahl in TortoiseGit einbinden. Dafür müssen Sie ein paar Git Eigenschaften definieren, die mit bugtraq: beginnen. Diese Eigenschaften müssen auf Ordner gesetzt werden: ()" #. (para) #: ../source/TortoiseGit_en.xml:10262 @@ -8691,13 +8691,13 @@ msgstr "Keine Fehlerverfolgungsinformationen im Projektarchivbetrachter" #. (para) #: ../source/TortoiseGit_en.xml:10518 -msgid "Because the issue tracker integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." -msgstr "Da die Integration mit Fehlerverfolgungssystemen vom Zugriff auf Subversion Eigenschaften abhängt, sehen Sie die Ergebnisse nur in einer Arbeitskopie. Im Projektarchivbetrachter steht diese Funktion nicht zur Verfügung, weil das Holen der Eigenschaften von einem Server eine zeitintensive Operation list." +msgid "Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgstr "Da die Integration mit Fehlerverfolgungssystemen vom Zugriff auf Git Eigenschaften abhängt, sehen Sie die Ergebnisse nur in einer Arbeitskopie. Im Projektarchivbetrachter steht diese Funktion nicht zur Verfügung, weil das Holen der Eigenschaften von einem Server eine zeitintensive Operation list." #. (para) #: ../source/TortoiseGit_en.xml:10525 -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." -msgstr "Die Integration mit Fehlerverfolgungssystemen ist nicht auf TortoiseGit limitiert, sie kann von jedem Subversion Client benutzt werden. Für weitere Informationen hierzu lesen Sie bitte die Issuetracker Integration Specification im TortoiseGit Projektarchiv. ( erklärt, wie man auf das TortoiseGit Projektarchiv zugreift)." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgstr "Die Integration mit Fehlerverfolgungssystemen ist nicht auf TortoiseGit limitiert, sie kann von jedem Git Client benutzt werden. Für weitere Informationen hierzu lesen Sie bitte die Issuetracker Integration Specification im TortoiseGit Projektarchiv. ( erklärt, wie man auf das TortoiseGit Projektarchiv zugreift)." #. (title) #: ../source/TortoiseGit_en.xml:10536 @@ -8751,8 +8751,8 @@ msgstr "WebSVN" #. (para) #: ../source/TortoiseGit_en.xml:10588 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." -msgstr "Es gibt mehrere webbasierte Projektarchivbetrachter, die mit Subversion eingesetzt werden können, zum Beispiel: ViewVC und WebSVN. TortoiseGit bietet Ihnen eine Integrationsmöglichkeit mit diesen Betrachtern an." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgstr "Es gibt mehrere webbasierte Projektarchivbetrachter, die mit Git eingesetzt werden können, zum Beispiel: ViewVC und WebSVN. TortoiseGit bietet Ihnen eine Integrationsmöglichkeit mit diesen Betrachtern an." #. (para) #: ../source/TortoiseGit_en.xml:10600 @@ -8781,8 +8781,8 @@ msgstr "Keine Projektarchiv-Verweise im Projektarchivbetrachter" #. (para) #: ../source/TortoiseGit_en.xml:10684 -msgid "Because the repo viewer integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." -msgstr "Da die Integration des Projektarchivbetrachters vom Zugriff auf Subversion Eigenschaften abhängt, sehen Sie die Ergebnisse nur in einer Arbeitskopie. Im Projektarchivbetrachter steht diese Funktion nicht zur Verfügung, weil das Holen der Eigenschaften von einem Server eine zeitintensive Operation list." +msgid "Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgstr "Da die Integration des Projektarchivbetrachters vom Zugriff auf Git Eigenschaften abhängt, sehen Sie die Ergebnisse nur in einer Arbeitskopie. Im Projektarchivbetrachter steht diese Funktion nicht zur Verfügung, weil das Holen der Eigenschaften von einem Server eine zeitintensive Operation list." #. (title) #: ../source/TortoiseGit_en.xml:10693 @@ -8816,8 +8816,8 @@ msgstr "Der Einstellungsdialog, Allgemein" #. (para) #: ../source/TortoiseGit_en.xml:10710 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." -msgstr " Dieser Dialog erlaubt Ihnen die Sprache der Anwenderoberfläche sowie einige Subversion Parameter einzustellen." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." +msgstr " Dieser Dialog erlaubt Ihnen die Sprache der Anwenderoberfläche sowie einige Git Parameter einzustellen." #. (term) #: ../source/TortoiseGit_en.xml:10720 @@ -8886,13 +8886,13 @@ msgstr "Globale Ignoriermuster sorgen dafür, dass bestimmte unversionierte Date #. (para) #: ../source/TortoiseGit_en.xml:10792 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." -msgstr "Beachten Sie, dass die Ignoriermuster, die Sie hier einstellen, auch andere Subversion Clients, inklusive der Subversion Kommandozeile, auf Ihrem PC beeinflussen." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." +msgstr "Beachten Sie, dass die Ignoriermuster, die Sie hier einstellen, auch andere Git Clients, inklusive der Git Kommandozeile, auf Ihrem PC beeinflussen." #. (para) #: ../source/TortoiseGit_en.xml:10798 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." -msgstr "Wenn Sie die Subversion Konfigurationsdatei verwenden, um ein global-ignores Muster zu definieren, wird das die TortoiseGit Einstellungen überlagern. Die Subversion Konfigurationsdatei kann über die Bearbeiten Schaltfläche geändert werden." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." +msgstr "Wenn Sie die Git Konfigurationsdatei verwenden, um ein global-ignores Muster zu definieren, wird das die TortoiseGit Einstellungen überlagern. Die Git Konfigurationsdatei kann über die Bearbeiten Schaltfläche geändert werden." #. (para) #: ../source/TortoiseGit_en.xml:10806 @@ -8911,13 +8911,13 @@ msgstr "Diese Einstellung zwingt TortoiseGit das Dateidatum beim Auschecken oder #. (term) #: ../source/TortoiseGit_en.xml:10834 -msgid "Subversion configuration file" -msgstr "Subversion Konfigurationsdatei" +msgid "Git configuration file" +msgstr "Git Konfigurationsdatei" #. (para) #: ../source/TortoiseGit_en.xml:10836 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." -msgstr "Mittels Bearbeiten können Sie die Subversion-Konfigurationsdatei in einem Standard-Texteditor öffnen. Einige Einstellungen können nicht mit TortoiseGit vorgenommen werden sondern nur direkt in der Konfigurationsdatei geändert werden. Für mehr Informationen über die Subversion config Datei lesen Sie bitte das Kapitel Runtime Configuration Area des Subversion Buchs. Der Abschnitt Automatic Property Setting ist hier auch von Interesse. Beachten Sie bitte, dass Subversion seine Einstellungen nacheinander an verschiedenen Stellen sucht. Die Reihenfolge und die Prioritäten werden in Configuration and the Windows Registry erklärt." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgstr "Mittels Bearbeiten können Sie die Git-Konfigurationsdatei in einem Standard-Texteditor öffnen. Einige Einstellungen können nicht mit TortoiseGit vorgenommen werden sondern nur direkt in der Konfigurationsdatei geändert werden. Für mehr Informationen über die Git config Datei lesen Sie bitte das Kapitel Runtime Configuration Area des Git Buchs. Der Abschnitt Automatic Property Setting ist hier auch von Interesse. Beachten Sie bitte, dass Git seine Einstellungen nacheinander an verschiedenen Stellen sucht. Die Reihenfolge und die Prioritäten werden in Configuration and the Windows Registry erklärt." #. (term) #: ../source/TortoiseGit_en.xml:10861 @@ -8926,13 +8926,13 @@ msgstr "Verwende _svn anstelle von .svn.svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." -msgstr "VS.NET kann, wenn es mit Webprojekten genutzt wird, nicht mit den .svn Ordnern umgehen, die Subversion verwendet, um seine internen Informationen abzulegen. Das ist kein Fehler in Subversion. Der Fehler liegt in VS.Net und den von ihm verwendeten Frontpage Erweiterungen.Lesen Sie für weitere Informationen zu diesem Thema." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgstr "VS.NET kann, wenn es mit Webprojekten genutzt wird, nicht mit den .svn Ordnern umgehen, die Git verwendet, um seine internen Informationen abzulegen. Das ist kein Fehler in Git. Der Fehler liegt in VS.Net und den von ihm verwendeten Frontpage Erweiterungen.Lesen Sie für weitere Informationen zu diesem Thema." #. (para) #: ../source/TortoiseGit_en.xml:10870 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." -msgstr "Wenn Sie das Verhalten von Subversion und TortoiseGit verändern wollen können Sie mit dieser Option die Umgebungsvariable setzen, die das Verhalten kontrolliert." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgstr "Wenn Sie das Verhalten von Git und TortoiseGit verändern wollen können Sie mit dieser Option die Umgebungsvariable setzen, die das Verhalten kontrolliert." #. (para) #: ../source/TortoiseGit_en.xml:10875 @@ -9031,8 +9031,8 @@ msgstr "Schließen, falls keine Konflikte schließt den Dia #. (para) #: ../source/TortoiseGit_en.xml:10993 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." -msgstr "Schließen, falls keine Fehler schließt den Dialog automatisch, auch wenn Konflikte aufgetreten sind. Der Dialog bleibt jedoch offen wenn Fehler aufgetreten sind, die verhindert haben, dass Subversion die Aktion ausführen konnte, zum Beispiel wenn der Server nicht erreichbar oder die Arbeitskopie veraltet ist." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgstr "Schließen, falls keine Fehler schließt den Dialog automatisch, auch wenn Konflikte aufgetreten sind. Der Dialog bleibt jedoch offen wenn Fehler aufgetreten sind, die verhindert haben, dass Git die Aktion ausführen konnte, zum Beispiel wenn der Server nicht erreichbar oder die Arbeitskopie veraltet ist." #. (term) #: ../source/TortoiseGit_en.xml:11005 @@ -9401,13 +9401,13 @@ msgstr "Die Ausschlusspfade teilen TortoiseGit mit, für we #. (para) #: ../source/TortoiseGit_en.xml:11407 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "f:\\development\\SVN\\Subversion deaktiviert die überlagerten Symbole nur für diesen speziellen Ordner. In den darunter liegenden Ordnern werden Sie weiterhin alle Symbole sehen." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "f:\\development\\SVN\\Git deaktiviert die überlagerten Symbole nur für diesen speziellen Ordner. In den darunter liegenden Ordnern werden Sie weiterhin alle Symbole sehen." #. (para) #: ../source/TortoiseGit_en.xml:11412 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "f:\\development\\SVN\\Subversion* deaktiviert die überlagerten Symbole für alle Dateien und Ordner, deren Pfad mit f:\\development\\SVN\\Subversion beginnt. Das bedeutet dass auch für alle Dateien und Ordner innerhalb keine überlagerten Symbole angezeigt werden." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "f:\\development\\SVN\\Git* deaktiviert die überlagerten Symbole für alle Dateien und Ordner, deren Pfad mit f:\\development\\SVN\\Git beginnt. Das bedeutet dass auch für alle Dateien und Ordner innerhalb keine überlagerten Symbole angezeigt werden." #. (para) #: ../source/TortoiseGit_en.xml:11419 @@ -9511,8 +9511,8 @@ msgstr " Hier können Sie Einstellungen für einen Proxyserver v #. (para) #: ../source/TortoiseGit_en.xml:11514 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." -msgstr "Wenn Sie Proxy Einstellungen für jedes Projektarchiv vornehmen wollen, müssen Sie das in der Subversion servers Datei einstellen. Über die Bearbeiten Schaltfläche kommen Sie direkt dort hin. Lesen Sie dazu im Kapitel Runtime Configuration Area des Subversion Buchs nach, wie die Datei aufgebaut ist." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgstr "Wenn Sie Proxy Einstellungen für jedes Projektarchiv vornehmen wollen, müssen Sie das in der Git servers Datei einstellen. Über die Bearbeiten Schaltfläche kommen Sie direkt dort hin. Lesen Sie dazu im Kapitel Runtime Configuration Area des Git Buchs nach, wie die Datei aufgebaut ist." #. (para) #: ../source/TortoiseGit_en.xml:11524 @@ -9544,8 +9544,8 @@ msgstr "Um zu vermeiden, dass Sie wiederholt nach einem Passwort gefragt werden, #. (para) #: ../source/TortoiseGit_en.xml:11564 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." -msgstr "Abschließend bleibt festzuhalten, dass die Einrichtung von SSH auf Server und Client ein nicht-trivialer Prozess ist, der den Rahmen dieses Handbuchs sprengt. Sie finden eine weitere Anleitung unter Subversion/TortoiseGit SSH How-To ." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." +msgstr "Abschließend bleibt festzuhalten, dass die Einrichtung von SSH auf Server und Client ein nicht-trivialer Prozess ist, der den Rahmen dieses Handbuchs sprengt. Sie finden eine weitere Anleitung unter Git/TortoiseGit SSH How-To ." #. (title) #: ../source/TortoiseGit_en.xml:11574 @@ -9640,8 +9640,8 @@ msgstr "Wenn Sie die svn:keywords Eigenschaft gesetzt haben, #. (para) #: ../source/TortoiseGit_en.xml:11680 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." -msgstr "Sie können auch ein eigenes Programm für Subversion Eigenschaften angeben. Da es sich dabei um einfache, kurze Texte handelt, wollen Sie vielleicht einen einfachen, kompakten Betrachter verwenden" +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgstr "Sie können auch ein eigenes Programm für Git Eigenschaften angeben. Da es sich dabei um einfache, kurze Texte handelt, wollen Sie vielleicht einen einfachen, kompakten Betrachter verwenden" #. (para) #: ../source/TortoiseGit_en.xml:11685 @@ -9816,8 +9816,8 @@ msgstr "Anmeldedaten" #. (para) #: ../source/TortoiseGit_en.xml:11913 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" -msgstr "Wenn Sie sich an einem Subversion Server anmelden, können Anmeldename und Passwort lokal gespeichert werden, damit Sie sie nicht ständig eingeben müssen. Vielleicht möchten Sie die Anmeldedaten aus Sicherheitsgründen löschen oder weil Sie unter einem anderen Namen auf das Projektarchiv zugreifen wollen ... Weiß John, dass Sie seinen PC benutzen?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgstr "Wenn Sie sich an einem Git Server anmelden, können Anmeldename und Passwort lokal gespeichert werden, damit Sie sie nicht ständig eingeben müssen. Vielleicht möchten Sie die Anmeldedaten aus Sicherheitsgründen löschen oder weil Sie unter einem anderen Namen auf das Projektarchiv zugreifen wollen ... Weiß John, dass Sie seinen PC benutzen?" #. (para) #: ../source/TortoiseGit_en.xml:11920 @@ -10056,8 +10056,8 @@ msgstr "Der Einstellungsdialog, Aktionsskripte" #. (para) #: ../source/TortoiseGit_en.xml:12154 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." -msgstr " Dieser Dialog erlaubt Ihnen Aktionsskripte festzulegen, die automatisch bei bestimmten Subversionaktionen ausgeführt werden. Im Gegensatz zu den in beschriebenen serverseitigen Aktionsskripten, werden diese Skripte lokal ausgeführt." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgstr " Dieser Dialog erlaubt Ihnen Aktionsskripte festzulegen, die automatisch bei bestimmten Gitaktionen ausgeführt werden. Im Gegensatz zu den in beschriebenen serverseitigen Aktionsskripten, werden diese Skripte lokal ausgeführt." #. (para) #: ../source/TortoiseGit_en.xml:12164 @@ -10136,7 +10136,7 @@ msgstr "Vor Aktualisierung" #. (para) #: ../source/TortoiseGit_en.xml:12228 -msgid "Called before the actual Subversion update begins." +msgid "Called before the actual Git update begins." msgstr "Wird aufgerufen, bevor die Aktualisierung beginnt." #. (term) @@ -10248,8 +10248,8 @@ msgstr "Beachten Sie bitte Folgendes: Obwohl wir zu Ihrer Bequemlichkeit die Par #. (para) #: ../source/TortoiseGit_en.xml:12406 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." -msgstr "Falls Sie die Subversionoperation zurückhalten wollen, bis das Aktionsskript fertig ist, wählen Sie die Option Warte auf Beendigung des Skripts." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." +msgstr "Falls Sie die Gitoperation zurückhalten wollen, bis das Aktionsskript fertig ist, wählen Sie die Option Warte auf Beendigung des Skripts." #. (para) #: ../source/TortoiseGit_en.xml:12410 @@ -10358,8 +10358,8 @@ msgstr "Einige selten verwendete Einstellungen können nur über die Windows Reg #. (para) #: ../source/TortoiseGit_en.xml:12533 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." -msgstr "Sie können einen anderen Ort für die Subversion Konfigurationsdateien angeben, indem Sie den Schlüssel HKCU\\Software\\TortoiseGit\\ConfigDir ändern. Dies beeinflusst alle TortoiseGit Aktionen." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgstr "Sie können einen anderen Ort für die Git Konfigurationsdateien angeben, indem Sie den Schlüssel HKCU\\Software\\TortoiseGit\\ConfigDir ändern. Dies beeinflusst alle TortoiseGit Aktionen." #. (term) #: ../source/TortoiseGit_en.xml:12542 @@ -10423,8 +10423,8 @@ msgstr "Der Log-Dialog hebt die aktuelle Revision einer Datei in der Arbeitskopi #. (title) #: ../source/TortoiseGit_en.xml:12623 -msgid "Subversion Working Folders" -msgstr "Subversion Arbeitsordner" +msgid "Git Working Folders" +msgstr "Git Arbeitsordner" #. (primary) #: ../source/TortoiseGit_en.xml:12625 @@ -10438,8 +10438,8 @@ msgstr "_svn Ordner" #. (para) #: ../source/TortoiseGit_en.xml:12630 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." -msgstr "VS.NET kann, wenn es mit Webprojekten genutzt wird, nicht mit den .svn Ordnern umgehen, die Subversion verwendet, um seine internen Informationen abzulegen. Das ist kein Fehler in Subversion. Der Fehler liegt in VS.NET 2003 und den von ihm verwendeten Frontpage Erweiterungen." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgstr "VS.NET kann, wenn es mit Webprojekten genutzt wird, nicht mit den .svn Ordnern umgehen, die Git verwendet, um seine internen Informationen abzulegen. Das ist kein Fehler in Git. Der Fehler liegt in VS.NET 2003 und den von ihm verwendeten Frontpage Erweiterungen." #. (para) #: ../source/TortoiseGit_en.xml:12637 @@ -10448,8 +10448,8 @@ msgstr "Beachten Sie bitte, dass dieser Fehler in VS2005 und neueren Versionen b #. (para) #: ../source/TortoiseGit_en.xml:12641 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." -msgstr "Seit Version 1.3.0 von Subversion und TortoiseGit, können Sie die Umgebungsvariable SVN_ASP_DOT_NET_HACK setzen. Wenn diese Variable gesetzt ist, wird Subversion _svn Ordner anstelle von .svn für seine Administrationsordner verwenden. Sie müssen den Explorer neu starten, damit diese Änderung wirksam wird. Normalerweise erfordert das einen Neustart Ihres PC. Um das zu vereinfachen, können Sie in den allgemeinen Einstellungen eine Option setzen. Siehe ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgstr "Seit Version 1.3.0 von Git und TortoiseGit, können Sie die Umgebungsvariable SVN_ASP_DOT_NET_HACK setzen. Wenn diese Variable gesetzt ist, wird Git _svn Ordner anstelle von .svn für seine Administrationsordner verwenden. Sie müssen den Explorer neu starten, damit diese Änderung wirksam wird. Normalerweise erfordert das einen Neustart Ihres PC. Um das zu vereinfachen, können Sie in den allgemeinen Einstellungen eine Option setzen. Siehe ." #. (para) #: ../source/TortoiseGit_en.xml:12651 @@ -10503,8 +10503,8 @@ msgstr "Versionsnummer in Dateien" #. (para) #: ../source/TortoiseGit_en.xml:12702 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." -msgstr "SubWCRev ist ein Windows Kommandozeilenprogramm, das dazu verwendet werden kann, den Status einer Subversion Arbeitskopie zu ermitteln und optional Schlüsselwörter in einer Vorlagendatei zu ersetzen. Dies wird häufig als Teil eines automatisierten Erstellungsprozesses verwendet, um Informationen über die Arbeitskopie in das erstellte Objekt einfließen zu lassen. Beispielsweise kann man damit die Revisionsnummer in einen Über...-Dialog einbetten." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgstr "SubWCRev ist ein Windows Kommandozeilenprogramm, das dazu verwendet werden kann, den Status einer Git Arbeitskopie zu ermitteln und optional Schlüsselwörter in einer Vorlagendatei zu ersetzen. Dies wird häufig als Teil eines automatisierten Erstellungsprozesses verwendet, um Informationen über die Arbeitskopie in das erstellte Objekt einfließen zu lassen. Beispielsweise kann man damit die Revisionsnummer in einen Über...-Dialog einbetten." #. (title) #: ../source/TortoiseGit_en.xml:12716 @@ -10513,8 +10513,8 @@ msgstr "Die SubWCRev Kommandozeile" #. (para) #: ../source/TortoiseGit_en.xml:12717 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." -msgstr "SubWCRev liest den Subversion Status aller Dateien einer Arbeitskopie. Externals werden standardmäßig ausgeschlossen. Es ermittelt die höchste Revisionsnummer sowie deren Zeitstempel. Außerdem wird festgehalten, ob es lokale Änderungen in der Arbeitskopie sowie gemischte Revisionsnummern aus verschiedenen Aktualisierungen gibt. Die Revisionsnummer, der Revisionsbereich und der Änderungsstatus werden auf die Standardausgabe ausgegeben." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgstr "SubWCRev liest den Git Status aller Dateien einer Arbeitskopie. Externals werden standardmäßig ausgeschlossen. Es ermittelt die höchste Revisionsnummer sowie deren Zeitstempel. Außerdem wird festgehalten, ob es lokale Änderungen in der Arbeitskopie sowie gemischte Revisionsnummern aus verschiedenen Aktualisierungen gibt. Die Revisionsnummer, der Revisionsbereich und der Änderungsstatus werden auf die Standardausgabe ausgegeben." #. (para) #: ../source/TortoiseGit_en.xml:12725 @@ -11010,8 +11010,8 @@ msgstr "Die Meldung, die eingegeben wurde als die Sperre erzeugt wurde." #. (para) #: ../source/TortoiseGit_en.xml:13031 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " -msgstr "Wenn sie Zugriff auf Subversion Revisionsinformationen aus anderen Programmen benötigen, können Sie die COM Schnittstelle von SubWCRev benutzen. Das zu erzeugende Objekt heißt SubWCRev.object und unterstützt die folgenden Methoden: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgstr "Wenn sie Zugriff auf Git Revisionsinformationen aus anderen Programmen benötigen, können Sie die COM Schnittstelle von SubWCRev benutzen. Das zu erzeugende Objekt heißt SubWCRev.object und unterstützt die folgenden Methoden: " #. (programlisting) #: ../source/TortoiseGit_en.xml:13149 @@ -11288,8 +11288,8 @@ msgstr "FAQ" #. (para) #: ../source/TortoiseGit_en.xml:13237 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "Da TortoiseGit sich ständig weiterentwickelt, ist es manchmal schwierig, die Dokumentation auf dem neuesten Stand zu halten. Wir unterhalten eine Online FAQ, die eine Auswahl der am häufigsten auf den TortoiseGit Mailinglisten dev@TortoiseGit.tigris.org und users@TortoiseGit.tigris.org gestellten Fragen enthält." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "Da TortoiseGit sich ständig weiterentwickelt, ist es manchmal schwierig, die Dokumentation auf dem neuesten Stand zu halten. Wir unterhalten eine Online FAQ, die eine Auswahl der am häufigsten auf den TortoiseGit Mailinglisten tortoisegit-dev@googlegroups.com und tortoisegit-users@googlegroups.com gestellten Fragen enthält." #. (para) #: ../source/TortoiseGit_en.xml:13249 @@ -11298,8 +11298,8 @@ msgstr "Wir unterhalten außerdem ein users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." -msgstr "Wenn Sie eine Frage haben, auf die Sie nirgends eine Antwort gefunden haben, sollten Sie die Frage in einer unserer Mailingliste stellen. users@TortoiseGit.tigris.org ist für Fragen zur Arbeit mit TortoiseGit. Wenn Sie bei der Entwicklung helfen wollen, sollten Sie an den Diskussionen auf dev@TortoiseGit.tigris.org teilnehmen." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." +msgstr "Wenn Sie eine Frage haben, auf die Sie nirgends eine Antwort gefunden haben, sollten Sie die Frage in einer unserer Mailingliste stellen. tortoisegit-users@googlegroups.com ist für Fragen zur Arbeit mit TortoiseGit. Wenn Sie bei der Entwicklung helfen wollen, sollten Sie an den Diskussionen auf tortoisegit-dev@googlegroups.com teilnehmen." #. (title) #: ../source/TortoiseGit_en.xml:13275 @@ -11358,8 +11358,8 @@ msgstr "Leere Logmeldung" #. (para) #: ../source/TortoiseGit_en.xml:13340 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." -msgstr "Es gibt zwei Wege, die Anwender dazu zu bringen, eine Logmeldung einzugeben. Eine Methode geht nur mit TortoiseGit, die andere funktioniert mit allen Subversion Clients, erfordert jedoch direkten Zugriff auf den Server." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." +msgstr "Es gibt zwei Wege, die Anwender dazu zu bringen, eine Logmeldung einzugeben. Eine Methode geht nur mit TortoiseGit, die andere funktioniert mit allen Git Clients, erfordert jedoch direkten Zugriff auf den Server." #. (title) #: ../source/TortoiseGit_en.xml:13346 @@ -11369,7 +11369,7 @@ msgstr "Aktionsskript auf dem Server" #. (para) #: ../source/TortoiseGit_en.xml:13347 msgid "If you have direct access to the repository server, you can install a pre-commit hook script which rejects all commits with an empty or too short log message." -msgstr "Wenn Sie direkten Zugriff auf den Subversion Server haben, können Sie ein pre-commit Aktionsskript installieren, das alle Übertragungen mit leeren oder zu kurzen Logmeldungen ablehnt." +msgstr "Wenn Sie direkten Zugriff auf den Git Server haben, können Sie ein pre-commit Aktionsskript installieren, das alle Übertragungen mit leeren oder zu kurzen Logmeldungen ablehnt." #. (para) #: ../source/TortoiseGit_en.xml:13352 @@ -11378,8 +11378,8 @@ msgstr "Im Projektarchivordner auf dem Server gibt es einen Unterordner namens < #. (para) #: ../source/TortoiseGit_en.xml:13362 -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." -msgstr "Diese Methode wird empfohlen, wenn Ihre Anwender auch andere Subversion Clients als TortoiseGit benutzen. Der Nachteil ist, dass die Übertragung vom Server abgelehnt wird und dass die Anwender eine Fehlermeldung erhalten. Das Clientprogramm kann vor der Übertragung nicht wissen, dass diese abgelehnt werden wird. Wenn Sie möchten, dass TortoiseGit die OK Schaltfläche deaktiviert, wenn die Logmeldung nicht lang genug ist, benutzen Sie die unten stehende Methode." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgstr "Diese Methode wird empfohlen, wenn Ihre Anwender auch andere Git Clients als TortoiseGit benutzen. Der Nachteil ist, dass die Übertragung vom Server abgelehnt wird und dass die Anwender eine Fehlermeldung erhalten. Das Clientprogramm kann vor der Übertragung nicht wissen, dass diese abgelehnt werden wird. Wenn Sie möchten, dass TortoiseGit die OK Schaltfläche deaktiviert, wenn die Logmeldung nicht lang genug ist, benutzen Sie die unten stehende Methode." #. (title) #: ../source/TortoiseGit_en.xml:13373 @@ -11521,12 +11521,12 @@ msgstr "Mit Hilfe von svndumpfilter" #. (para) #: ../source/TortoiseGit_en.xml:13552 msgid "Since TortoiseGit never loses data, your rolled back revisions still exist as intermediate revisions in the repository. Only the HEAD revision was changed to a previous state. If you want to make revisions disappear completely from your repository, erasing all trace that they ever existed, you have to use more extreme measures. Unless there is a really good reason to do this, it is not recommended. One possible reason would be that someone committed a confidential document to a public repository." -msgstr "Da Subversion niemals Daten verliert und alle Änderungen protokolliert sind Ihre rückgängig gemachten Revisionen noch als Zwischenstände im Projektarchiv enthalten. Das kann bei versehentlich in ein öffentlich zugängliches Projektarchiv übertragenen vertraulichen Daten ein großes Problem darstellen. Wenn Sie möchten, dass Ihre Revisionen vollständig aus dem Projektarchiv verschwinden, müssen Sie recht extreme Maßnahmen ergreifen. Solange es keinen wirklich guten Grund dafür gibt, raten wir dringend davon ab." +msgstr "Da Git niemals Daten verliert und alle Änderungen protokolliert sind Ihre rückgängig gemachten Revisionen noch als Zwischenstände im Projektarchiv enthalten. Das kann bei versehentlich in ein öffentlich zugängliches Projektarchiv übertragenen vertraulichen Daten ein großes Problem darstellen. Wenn Sie möchten, dass Ihre Revisionen vollständig aus dem Projektarchiv verschwinden, müssen Sie recht extreme Maßnahmen ergreifen. Solange es keinen wirklich guten Grund dafür gibt, raten wir dringend davon ab." #. (para) #: ../source/TortoiseGit_en.xml:13563 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." -msgstr "Der einzige Weg, Daten komplett aus dem Projektarchiv zu entfernen führt über das Subversion Kommandozeilen Programm svnadmin. Eine Anwendungsbeschreibung findet sich im Kapitel Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgstr "Der einzige Weg, Daten komplett aus dem Projektarchiv zu entfernen führt über das Git Kommandozeilen Programm svnadmin. Eine Anwendungsbeschreibung findet sich im Kapitel Repository Maintenance." #. (title) #: ../source/TortoiseGit_en.xml:13574 @@ -11590,8 +11590,8 @@ msgstr "Setzen Sie die svn:externals Eigenschaft auf Ordner i #. (para) #: ../source/TortoiseGit_en.xml:13657 -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." -msgstr "Übertragen Sie diese Änderungen. Nun, wenn Sie Ihre Arbeitskopie aktualisieren wird Subversion eine Kopie des externen Projektes in Ihre Arbeitskopie einfügen. Jedes Mal wenn Sie eine Aktualisierung vornehmen, wird automatisch auch das externe Projekt aktualisiert. Änderungen, welche Sie am gemeinsamen Code vornehmen werden ebenfalls in das externe Projektarchiv mit übertragen." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgstr "Übertragen Sie diese Änderungen. Nun, wenn Sie Ihre Arbeitskopie aktualisieren wird Git eine Kopie des externen Projektes in Ihre Arbeitskopie einfügen. Jedes Mal wenn Sie eine Aktualisierung vornehmen, wird automatisch auch das externe Projekt aktualisiert. Änderungen, welche Sie am gemeinsamen Code vornehmen werden ebenfalls in das externe Projektarchiv mit übertragen." #. (para) #: ../source/TortoiseGit_en.xml:13676 @@ -11605,7 +11605,7 @@ msgstr "Verschachtelte Arbeitskopien" #. (para) #: ../source/TortoiseGit_en.xml:13685 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" msgstr "Erstellen Sie einen neuen Ordner in Ihrem Projekt, welcher den gemeinsamen Code enthalten soll, aber fügen Sie diesen nicht zu Ihrer Arbeitskopie hinzu." #. (para) @@ -12192,8 +12192,8 @@ msgstr "Da alle Befehle von TortoiseGit über Kommandozeilenparameter beeinfluss #. (para) #: ../source/TortoiseGit_en.xml:14192 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." -msgstr "Beachten Sie, dass TortoiseGit eine graphische Anwendung ist und dass diese Automatisierungsanleitung Ihnen erklärt, wie man die Dialoge von TortoiseGit zur Abfrage von Benutzereingaben verwendet. Wenn Sie ein Skript schreiben wollen, das keine Eingaben erfordert, sollten Sie dafür das offizielle Subversion Kommandozeilenprogramm verwenden." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." +msgstr "Beachten Sie, dass TortoiseGit eine graphische Anwendung ist und dass diese Automatisierungsanleitung Ihnen erklärt, wie man die Dialoge von TortoiseGit zur Abfrage von Benutzereingaben verwendet. Wenn Sie ein Skript schreiben wollen, das keine Eingaben erfordert, sollten Sie dafür das offizielle Git Kommandozeilenprogramm verwenden." #. (title) #. (title) @@ -12814,18 +12814,18 @@ msgstr "CLI" #. (para) #: ../source/TortoiseGit_en.xml:14786 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." -msgstr "Manchmal finden sich in diesem Handbuch Verweise auf die allgemeine Subversion Dokumentation, die die Bedienung mit dem Kommandozeilen-Client (CLI) beschreibt. Um Ihnen zu verdeutlichen, welche Funktionen TortoiseGit im Verborgenen aufruft, haben wir eine Liste der Kommandozeilenbefehle zusammengestellt, die den Funktionen der grafischen Oberfläche von TortoiseGit entsprechen." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgstr "Manchmal finden sich in diesem Handbuch Verweise auf die allgemeine Git Dokumentation, die die Bedienung mit dem Kommandozeilen-Client (CLI) beschreibt. Um Ihnen zu verdeutlichen, welche Funktionen TortoiseGit im Verborgenen aufruft, haben wir eine Liste der Kommandozeilenbefehle zusammengestellt, die den Funktionen der grafischen Oberfläche von TortoiseGit entsprechen." #. (para) #: ../source/TortoiseGit_en.xml:14795 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." -msgstr "Obwohl es äquivalente Kommandozeilenbefehle gibt, beachten Sie bitte dass TortoiseGit nicht das Subversion Kommandozeilenprogramm aufruft, sondern direkt auf die Subversion Bibliotheken zugreift." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." +msgstr "Obwohl es äquivalente Kommandozeilenbefehle gibt, beachten Sie bitte dass TortoiseGit nicht das Git Kommandozeilenprogramm aufruft, sondern direkt auf die Git Bibliotheken zugreift." #. (para) #: ../source/TortoiseGit_en.xml:14801 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." -msgstr "Wenn Sie einen Fehler von TortoiseGit berichten, kann es vorkommen, dass wir Sie auffordern, dieses Fehlverhalten mit dem Kommandozeilen-Client zu reproduzieren, damit wir TortoiseGit Probleme von Subversion Problemen unterscheiden können. Diese Kurzreferenz zeigt Ihnen, welche Befehle Sie verwenden können." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." +msgstr "Wenn Sie einen Fehler von TortoiseGit berichten, kann es vorkommen, dass wir Sie auffordern, dieses Fehlverhalten mit dem Kommandozeilen-Client zu reproduzieren, damit wir TortoiseGit Probleme von Git Problemen unterscheiden können. Diese Kurzreferenz zeigt Ihnen, welche Befehle Sie verwenden können." #. (title) #: ../source/TortoiseGit_en.xml:14809 @@ -12888,7 +12888,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14859 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." msgstr "Das Aktualisieren mehrerer Dateien ist keine atomare Operation. TortoiseGit bestimmt zunächst die neueste Revision (HEAD) im Projektarchiv und aktualisiert anschließend alle Objekte zu dieser Revisionsnummer, damit Sie keine aus zwei Revisionen zusammengesetzte Arbeitskopie erhalten." #. (para) @@ -12925,8 +12925,8 @@ msgstr "Wenn Nur den obersten Ordner auschecken gewählt is #. (para) #: ../source/TortoiseGit_en.xml:14894 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." -msgstr "In TortoiseGit nutzt der Übertragen-Dialog mehrere Subversion Befehle. Der erste Schritt ist eine Statusprüfung, die die Objekte in Ihrer Arbeitskopie ermittelt, die übertragen werden können. Sie können diese Liste überprüfen, Dateien mit dem Original (BASE) vergleichen und die Objekte, die Sie übertragen wollen, auswählen." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgstr "In TortoiseGit nutzt der Übertragen-Dialog mehrere Git Befehle. Der erste Schritt ist eine Statusprüfung, die die Objekte in Ihrer Arbeitskopie ermittelt, die übertragen werden können. Sie können diese Liste überprüfen, Dateien mit dem Original (BASE) vergleichen und die Objekte, die Sie übertragen wollen, auswählen." #. (screen) #. (screen) @@ -12946,8 +12946,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14904 #: ../source/TortoiseGit_en.xml:14992 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." -msgstr "Wenn Zeige nicht versionierte Dateien gewählt ist, wird TortoiseGit alle nicht versionierten Dateien und Ordner in der Arbeitskopie, unter Berücksichtigung der Ausschluss- / Ignorier-Regeln anzeigen. Diese Funktion besitzt in Subversion kein Äquivalent, da der svn status Befehl nicht in unversionierte Ordner hinabsteigt." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." +msgstr "Wenn Zeige nicht versionierte Dateien gewählt ist, wird TortoiseGit alle nicht versionierten Dateien und Ordner in der Arbeitskopie, unter Berücksichtigung der Ausschluss- / Ignorier-Regeln anzeigen. Diese Funktion besitzt in Git kein Äquivalent, da der svn status Befehl nicht in unversionierte Ordner hinabsteigt." #. (para) #: ../source/TortoiseGit_en.xml:14912 @@ -12968,7 +12968,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14919 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." msgstr "Sobald Sie auf OK klicken, wird die Übertragung zum Projektarchiv durchgeführt. Falls Sie alle Dateiauswahlboxen in der Voreinstellung belassen haben, wird TortoiseGit die Daten in einem Schritt rekursiv übertragen. Sobald Sie einzelne Objekte abwählen, muss eine nicht-rekursive (-N) Übertragung durchgeführt werden. Dabei muss jeder Pfad einzeln auf der Kommandozeile übergeben werden." #. (screen) @@ -13008,7 +13008,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14944 msgid "If you use Diff from the main context menu, you are diffing a modified file against its BASE revision. The output from the CLI command above also does this and produces output in unified-diff format. However, this is not what TortoiseGit is using. TortoiseGit uses TortoiseMerge (or a diff program of your choosing) to display differences visually between full-text files, so there is no direct CLI equivalent." -msgstr "Wenn Sie Vergleich aus dem Kontextmenü heraus aufrufen, bilden Sie die Unterschiede zwischen einer geänderten Datei und deren BASE Revision. Die Subversion Kommandozeile tut dies auch, liefert jedoch die Ausgabe in einem standard (unified) Diff-Format. TortoiseGit hingegen verwendet TortoiseMerge (oder ein Vergleichsprogramm Ihrer Wahl), um die Unterschiede zwischen Textdateien graphisch anzuzeigen. Aus diesem Grunde gibt es keinen äquivalenten Befehl auf der Kommandozeile." +msgstr "Wenn Sie Vergleich aus dem Kontextmenü heraus aufrufen, bilden Sie die Unterschiede zwischen einer geänderten Datei und deren BASE Revision. Die Git Kommandozeile tut dies auch, liefert jedoch die Ausgabe in einem standard (unified) Diff-Format. TortoiseGit hingegen verwendet TortoiseMerge (oder ein Vergleichsprogramm Ihrer Wahl), um die Unterschiede zwischen Textdateien graphisch anzuzeigen. Aus diesem Grunde gibt es keinen äquivalenten Befehl auf der Kommandozeile." #. (para) #: ../source/TortoiseGit_en.xml:14953 @@ -13156,7 +13156,7 @@ msgstr "Der erste Schritt ist eine Statusprüfung, die die Objekte in Ihrer Arbe #. (para) #: ../source/TortoiseGit_en.xml:15072 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." msgstr "Sobald Sie auf OK klicken, werden Ihre Änderungen rückgängig gemacht. Falls Sie alle Dateiauswahlboxen in der Voreinstellung belassen haben, führt TortoiseGit die Aktion in einem Schritt rekursiv (-R) durch. Sobald Sie einzelne Objekte abwählen, muss jeder Pfad einzeln auf der Kommandozeile übergeben werden." #. (screen) @@ -13311,8 +13311,8 @@ msgstr "Dieser Dialog wird für nicht versionierte Ordner aufgerufen. Der Ordner #. (para) #: ../source/TortoiseGit_en.xml:15174 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." -msgstr "Der Export einer Arbeitskopie an einen anderen Ort wird ohne die Subversion Bibliotheken durchgeführt. Deshalb gibt es auch keinen entsprechenden Kommandozeilenbefehl." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." +msgstr "Der Export einer Arbeitskopie an einen anderen Ort wird ohne die Git Bibliotheken durchgeführt. Deshalb gibt es auch keinen entsprechenden Kommandozeilenbefehl." #. (para) #: ../source/TortoiseGit_en.xml:15179 @@ -13422,8 +13422,8 @@ msgstr "TortoiseGit erzeugt eine Patchdatei im Standard-Diff Format, indem die A #. (para) #: ../source/TortoiseGit_en.xml:15260 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." -msgstr "Patches anzuwenden ist ein kniffliges Unterfangen, es sei denn der Patch und die Arbeitskopie befinden sich in der gleichen Revision. Zum Glück für Sie existiert TortoiseMerge, für das es keine entsprechende Funktion in Subversion gibt." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." +msgstr "Patches anzuwenden ist ein kniffliges Unterfangen, es sei denn der Patch und die Arbeitskopie befinden sich in der gleichen Revision. Zum Glück für Sie existiert TortoiseMerge, für das es keine entsprechende Funktion in Git gibt." #. (title) #: ../source/TortoiseGit_en.xml:15274 @@ -13442,8 +13442,8 @@ msgstr "Priorität der überlagerten Symbole" #. (para) #: ../source/TortoiseGit_en.xml:15289 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." -msgstr "Jede Datei und jeder Ordner besitzt einen Statuswert in Subversion. Im Kommandozeilenclient werden diese durch einzelne Buchstaben gekennzeichnet, in TortoiseGit durch überlagerte Symbole. Da die Anzahl der zur Verfügung stehenden überlagerten Symbole durch Windows eingeschränkt wird, kann ein Symbol für mehrere Statuswerte stehen." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgstr "Jede Datei und jeder Ordner besitzt einen Statuswert in Git. Im Kommandozeilenclient werden diese durch einzelne Buchstaben gekennzeichnet, in TortoiseGit durch überlagerte Symbole. Da die Anzahl der zur Verfügung stehenden überlagerten Symbole durch Windows eingeschränkt wird, kann ein Symbol für mehrere Statuswerte stehen." #. (para) #: ../source/TortoiseGit_en.xml:15297 @@ -13475,17 +13475,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15331 -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." msgstr "" -"\n" -"Dieses Symbol bedeutet dass der Subversion Status Normal ist oder dass es sich um ein versioniertes Objekt handelt, dessen Status noch nicht bekannt ist. Da TortoiseGit im Hintergrund einen Statusspeicher verwendet, kann es ein paar Sekunden dauern, bis das Symbol aktualisiert wird." +"\n" +"Dieses Symbol bedeutet dass der Git Status Normal ist oder dass es sich um ein versioniertes Objekt handelt, dessen Status noch nicht bekannt ist. Da TortoiseGit im Hintergrund einen Statusspeicher verwendet, kann es ein paar Sekunden dauern, bis das Symbol aktualisiert wird." #. (para) #: ../source/TortoiseGit_en.xml:15340 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." msgstr "" "\n" -"Das Benötigt Sperre Symbol wird verwendet, um anzuzeigen, dass bei einer Datei die svn:needs-lock Eigenschaft gesetzt ist. Bei Arbeitskopien, die mit Subversion 1.4.0 oder neuer erstellt wurden, wird der svn:needs-lock Status lokal zwischengespeichert und dazu verwendet dieses Symbol anzuzeigen. Bei Arbeitskopien, die mit einer älteren Version erstellt wurden, zeigt TortoiseGit dieses Symbol, wenn die Datei schreibgeschützt ist. Beachten Sie, dass Subversion das Format seiner Arbeitskopien beim Aktualisieren automatisch auf den neuesten Stand bringt. Das Speichern der svn:needs-lock Eigenschaft erfolgt jedoch erst, wenn die Datei selbst aktualisiert wird." +"Das Benötigt Sperre Symbol wird verwendet, um anzuzeigen, dass bei einer Datei die svn:needs-lock Eigenschaft gesetzt ist. Bei Arbeitskopien, die mit Git 1.4.0 oder neuer erstellt wurden, wird der svn:needs-lock Status lokal zwischengespeichert und dazu verwendet dieses Symbol anzuzeigen. Bei Arbeitskopien, die mit einer älteren Version erstellt wurden, zeigt TortoiseGit dieses Symbol, wenn die Datei schreibgeschützt ist. Beachten Sie, dass Git das Format seiner Arbeitskopien beim Aktualisieren automatisch auf den neuesten Stand bringt. Das Speichern der svn:needs-lock Eigenschaft erfolgt jedoch erst, wenn die Datei selbst aktualisiert wird." #. (para) #: ../source/TortoiseGit_en.xml:15354 @@ -13497,7 +13497,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15359 msgid " The Ignored overlay is used to represent an item which is in the ignored state, either due to a global ignore pattern, or the svn:ignore property of the parent folder. This overlay is optional." -msgstr " Dieses Symbol bedeutet dass dieses Objekt von Subversion Ignoriert wird. Das kann aufgrund eines globalen Ignoriermusters oder der svn:ignore Eigenschaft des Elternobjekts der Fall sein. Dieses Symbol ist optional." +msgstr " Dieses Symbol bedeutet dass dieses Objekt von Git Ignoriert wird. Das kann aufgrund eines globalen Ignoriermusters oder der svn:ignore Eigenschaft des Elternobjekts der Fall sein. Dieses Symbol ist optional." #. (para) #: ../source/TortoiseGit_en.xml:15367 @@ -13508,13 +13508,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15375 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "Wenn ein Objekt sich nicht in einer Arbeitskopie befindet, wird kein überlagertes Symbol angezeigt. Wenn Sie die Ignoriert und Nicht Versioniert Symbole abgeschaltet haben, wird für solche Objekte auch innerhalb einer Arbeitskopie kein Symbol angezeigt." #. (para) #: ../source/TortoiseGit_en.xml:15382 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." -msgstr "Ein Objekt kann nur einen Subversion Status besitzen. Zum Beispiel kann eine Datei lokal verändert und gleichzeitig zum Löschen markiert sein. Subversion gibt in diesem Fall nur einen Wert - gelöscht zurück. Diese Prioritäten sind in Subversion selbst festgelegt." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." +msgstr "Ein Objekt kann nur einen Git Status besitzen. Zum Beispiel kann eine Datei lokal verändert und gleichzeitig zum Löschen markiert sein. Git gibt in diesem Fall nur einen Wert - gelöscht zurück. Diese Prioritäten sind in Git selbst festgelegt." #. (para) #: ../source/TortoiseGit_en.xml:15389 @@ -13558,23 +13558,23 @@ msgstr "Svnserve mit SSH sichern" #. (para) #: ../source/TortoiseGit_en.xml:15452 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." -msgstr "Dieser Abschnitt bietet eine schrittweise Anleitung wie man Subversion und TortoiseGit so einrichtet, dass sie das svn+ssh Protokoll verwenden. Falls Sie bereits ein SSH Anmeldeverfahren für Ihren Server nutzen, sind schon alle Voraussetzungen geschaffen und Sie finden weitere Details im Subversion Buch. Wenn Sie SSH noch nicht verwenden, dies aber möchten, um Ihre Subversion Installation abzusichern, bietet Ihnen diese Anleitung ein einfaches Verfahren, das kein separates SSH Konto für jeden Nutzer auf dem Server erfordert." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." +msgstr "Dieser Abschnitt bietet eine schrittweise Anleitung wie man Git und TortoiseGit so einrichtet, dass sie das svn+ssh Protokoll verwenden. Falls Sie bereits ein SSH Anmeldeverfahren für Ihren Server nutzen, sind schon alle Voraussetzungen geschaffen und Sie finden weitere Details im Git Buch. Wenn Sie SSH noch nicht verwenden, dies aber möchten, um Ihre Git Installation abzusichern, bietet Ihnen diese Anleitung ein einfaches Verfahren, das kein separates SSH Konto für jeden Nutzer auf dem Server erfordert." #. (para) #: ../source/TortoiseGit_en.xml:15462 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." -msgstr "In dieser Implementierung legen wir ein einzelnes SSH Konto für alle Subversion Nutzer an und verwenden unterschiedliche Anmeldeschlüssel zur Unterscheidung der einzelnen Anwender." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." +msgstr "In dieser Implementierung legen wir ein einzelnes SSH Konto für alle Git Nutzer an und verwenden unterschiedliche Anmeldeschlüssel zur Unterscheidung der einzelnen Anwender." #. (para) #: ../source/TortoiseGit_en.xml:15467 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." -msgstr "In diesem Anhang setzen wir voraus, dass Sie bereits Subversion installiert und, wie anderweitig im Handbuch beschrieben, ein Projektarchiv angelegt haben. Beachten Sie bitte, dass Sie bei Verwendung von SSH svnserve nicht als Dämon oder Dienst starten sollten." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgstr "In diesem Anhang setzen wir voraus, dass Sie bereits Git installiert und, wie anderweitig im Handbuch beschrieben, ein Projektarchiv angelegt haben. Beachten Sie bitte, dass Sie bei Verwendung von SSH svnserve nicht als Dämon oder Dienst starten sollten." #. (para) #: ../source/TortoiseGit_en.xml:15473 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" -msgstr "Ein Großteil der folgenden Informationen stammt aus einer Anleitung von Marc Logemann, die sich unter www.logemann.org findet. Weitere Hinweise zum Einrichten eines Windows Servers stammen von Thorsten Müller. Danke Jungs!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgstr "Ein Großteil der folgenden Informationen stammt aus einer Anleitung von Marc Logemann, die sich unter www.logemann.org findet. Weitere Hinweise zum Einrichten eines Windows Servers stammen von Thorsten Müller. Danke Jungs!" #. (title) #: ../source/TortoiseGit_en.xml:15484 @@ -13594,8 +13594,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15494 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." -msgstr "Bitte beachten Sie folgendes: Wenn Sie Subversion selber aus den Quellen erstellen und keine Parameter an ./configure übergeben, wird Subversion ein bin Verzeichnis unter /usr/local erstellen und seine Binärdateien dort ablegen. Falls Sie SSH Tunnel verwenden wollen, müssen Sie sich bewusst sein, dass der Benutzer, der sich per SSH anmeldet, svnserve und einige andere Binärdateien ausführen können muss. Aus diesem Grund sollten Sie entweder /usr/local/bin in die PATH Variable aufnehmen oder symbolische Verweise Ihrer Binärdateien in /usr/sbin oder einem anderen Verzeichnis erstellen, das normalerweise in der PATH Variable steht." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgstr "Bitte beachten Sie folgendes: Wenn Sie Git selber aus den Quellen erstellen und keine Parameter an ./configure übergeben, wird Git ein bin Verzeichnis unter /usr/local erstellen und seine Binärdateien dort ablegen. Falls Sie SSH Tunnel verwenden wollen, müssen Sie sich bewusst sein, dass der Benutzer, der sich per SSH anmeldet, svnserve und einige andere Binärdateien ausführen können muss. Aus diesem Grund sollten Sie entweder /usr/local/bin in die PATH Variable aufnehmen oder symbolische Verweise Ihrer Binärdateien in /usr/sbin oder einem anderen Verzeichnis erstellen, das normalerweise in der PATH Variable steht." #. (para) #: ../source/TortoiseGit_en.xml:15507 @@ -13753,7 +13753,7 @@ msgstr "SSH mit TortoiseGit testen" #. (para) #: ../source/TortoiseGit_en.xml:15657 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "Bisher haben wir nur überprüft, ob Sie sich über SSH anmelden können. Nun müssen wir sicherstellen, dass die SSH Verbindung tatsächlich svnserve starten kann. Dazu müssen Sie auf dem Server die Datei /home/svnuser/.ssh/authorized_keys so anpassen, dass viele Autoren dasselbe Systemkonto, svnuser benutzen können. Beachten Sie bitte, dass jeder Autor die gleiche Anmeldung aber einen unterschiedlichen Anmeldeschlüssel verwendet, so dass Sie für jeden Autor eine eigene Zeile eintragen müssen." #. (para) @@ -13872,8 +13872,8 @@ msgstr "Glossar" #. (para) #: ../source/TortoiseGit_en.xml:15809 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Ein Subversion Befehl, der zum Hinzufügen von Dateien oder Ordnern zu einem Projektarchiv benutzt wird. Die neuen Objekte werden beim Übertragen zum Projektarchiv hinzugefügt." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Ein Git Befehl, der zum Hinzufügen von Dateien oder Ordnern zu einem Projektarchiv benutzt wird. Die neuen Objekte werden beim Übertragen zum Projektarchiv hinzugefügt." #. (glossterm) #: ../source/TortoiseGit_en.xml:15817 @@ -13898,7 +13898,7 @@ msgstr "BDB" #. (para) #: ../source/TortoiseGit_en.xml:15842 msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." -msgstr "Berkeley DB. Ein bewährtes Datenbanksystem für Projektarchive. Kann nicht über Netzwerkfreigaben genutzt werden. Standard für Projektarchive von Subversion vor Version 1.2." +msgstr "Berkeley DB. Ein bewährtes Datenbanksystem für Projektarchive. Kann nicht über Netzwerkfreigaben genutzt werden. Standard für Projektarchive von Git vor Version 1.2." #. (glossterm) #: ../source/TortoiseGit_en.xml:15849 @@ -13907,23 +13907,23 @@ msgstr "Verzweigen" #. (para) #: ../source/TortoiseGit_en.xml:15851 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Ein Begriff der häufig in Versionskontrollsystemen verwendet wird, um zu beschreiben, wenn sich die Entwicklung an einem bestimmten Punkt verzweigt und verschiedenen Wegen folgt. Sie können von der Hauptentwicklungslinie abzweigen, um neue Funktionen zu implementieren ohne den Hauptzweig instabil zu machen. Genauso können Sie eine stabile, freigegebene Version abzweigen, an der Sie nur noch Fehler beseitigen, während die Weiterentwicklung am instabilen Hauptzweig erfolgt. In Subversion sind Zweige als billige Kopien implementiert." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Ein Begriff der häufig in Versionskontrollsystemen verwendet wird, um zu beschreiben, wenn sich die Entwicklung an einem bestimmten Punkt verzweigt und verschiedenen Wegen folgt. Sie können von der Hauptentwicklungslinie abzweigen, um neue Funktionen zu implementieren ohne den Hauptzweig instabil zu machen. Genauso können Sie eine stabile, freigegebene Version abzweigen, an der Sie nur noch Fehler beseitigen, während die Weiterentwicklung am instabilen Hauptzweig erfolgt. In Git sind Zweige als billige Kopien implementiert." #. (para) #: ../source/TortoiseGit_en.xml:15866 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Ein Subversionbefehl, der eine lokale Arbeitskopie in einem leeren Verzeichnis erstellt, indem versionierte Dateien aus einem Projektarchiv heruntergeladen werden." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Ein Gitbefehl, der eine lokale Arbeitskopie in einem leeren Verzeichnis erstellt, indem versionierte Dateien aus einem Projektarchiv heruntergeladen werden." #. (para) #: ../source/TortoiseGit_en.xml:15875 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Ein Zitat aus dem Subversion Buch: Räumt die Arbeitskopie rekursiv auf, entfernt dabei Sperren und setzt unvollendete Operationen fort. Wenn Sie jemals einen Arbeitskopie gesperrt Fehler bekommen, führen Sie diesen Befehl aus, um veraltete Sperren zu entfernen und Ihre Arbeitskopie wieder in einen nutzbaren Zustand zu versetzen. Beachten Sie, dass in diesem Zusammenhang Sperren lokale Dateisystemsperren bezeichnet und keine Sperren im Projektarchiv." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Ein Zitat aus dem Git Buch: Räumt die Arbeitskopie rekursiv auf, entfernt dabei Sperren und setzt unvollendete Operationen fort. Wenn Sie jemals einen Arbeitskopie gesperrt Fehler bekommen, führen Sie diesen Befehl aus, um veraltete Sperren zu entfernen und Ihre Arbeitskopie wieder in einen nutzbaren Zustand zu versetzen. Beachten Sie, dass in diesem Zusammenhang Sperren lokale Dateisystemsperren bezeichnet und keine Sperren im Projektarchiv." #. (para) #: ../source/TortoiseGit_en.xml:15892 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Dieser Subversionbefehl wird verwendet, um die Änderungen in Ihrer lokalen Arbeitskopie zurück in das Projektarchiv zu übertragen." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Dieser Gitbefehl wird verwendet, um die Änderungen in Ihrer lokalen Arbeitskopie zurück in das Projektarchiv zu übertragen." #. (glossterm) #: ../source/TortoiseGit_en.xml:15900 @@ -13932,8 +13932,8 @@ msgstr "Konflikt" #. (para) #: ../source/TortoiseGit_en.xml:15902 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Wenn Änderungen vom Projektarchiv mit den lokalen Änderungen zusammengeführt werden sollen, kann es vorkommen dass diese Änderungen in den selben Zeilen der Datei auftreten. In diesem Fall kann Subversion nicht selbst entscheiden welche Version zu verwenden ist und die Datei wird somit als in Konflikt markiert. Sie müssen die Datei von Hand editieren und den Konflikt auflösen, bevor Sie weitere Änderungen übertragen können." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Wenn Änderungen vom Projektarchiv mit den lokalen Änderungen zusammengeführt werden sollen, kann es vorkommen dass diese Änderungen in den selben Zeilen der Datei auftreten. In diesem Fall kann Git nicht selbst entscheiden welche Version zu verwenden ist und die Datei wird somit als in Konflikt markiert. Sie müssen die Datei von Hand editieren und den Konflikt auflösen, bevor Sie weitere Änderungen übertragen können." #. (glossterm) #: ../source/TortoiseGit_en.xml:15912 @@ -13942,8 +13942,8 @@ msgstr "Kopieren" #. (para) #: ../source/TortoiseGit_en.xml:15914 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "In einem Subversion Projektarchiv können Sie eine Kopie einer einzelnen Datei oder eines ganzen Baumes erstellen. Diese sind als billige Kopien in Form eines Verweises auf das Original implementiert. Somit benötigt selbst die Kopie eines Dateibaumes fast keinen Platz. Eine Kopie behält die Historie ihrer Vorgänger, so dass auch Logmeldungen über die Kopie hinaus verfolgt werden können." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "In einem Git Projektarchiv können Sie eine Kopie einer einzelnen Datei oder eines ganzen Baumes erstellen. Diese sind als billige Kopien in Form eines Verweises auf das Original implementiert. Somit benötigt selbst die Kopie eines Dateibaumes fast keinen Platz. Eine Kopie behält die Historie ihrer Vorgänger, so dass auch Logmeldungen über die Kopie hinaus verfolgt werden können." #. (para) #: ../source/TortoiseGit_en.xml:15926 @@ -13967,8 +13967,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15957 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Ein proprietäres Subversion-Dateisystem für Projektarchive. Kann über Netzwerkfreigaben genutzt werden. Seit Version 1.2 Standard für neue Projektarchive." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Ein proprietäres Git-Dateisystem für Projektarchive. Kann über Netzwerkfreigaben genutzt werden. Seit Version 1.2 Standard für neue Projektarchive." #. (para) #: ../source/TortoiseGit_en.xml:15966 @@ -13987,8 +13987,8 @@ msgstr "Die neueste Version einer Datei oder eines Ordners im Projekta #. (para) #: ../source/TortoiseGit_en.xml:15982 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Ein Subversionbefehl mit dem eine vollständige Ordnerhierarchie mit einer einzigen Revision in ein Projektarchiv importiert wird." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Ein Gitbefehl mit dem eine vollständige Ordnerhierarchie mit einer einzigen Revision in ein Projektarchiv importiert wird." #. (para) #: ../source/TortoiseGit_en.xml:15991 @@ -14032,8 +14032,8 @@ msgstr "Patch" #. (para) #: ../source/TortoiseGit_en.xml:16035 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Wenn eine Arbeitskopie nur Änderungen an Textdateien aufweist, ist es möglich mit dem Diff-Befehl von Subversion eine Datei zu erstellen, welche diese Änderungen im Standard-Diff Format enthält. Eine Datei mit solchem Inhalt wird üblicherweise als Patch bezeichnet und kann zum Beispiel jemand anderem per Mail geschickt werden, der diese Änderungen dann in seine Arbeitskopie übernehmen kann. Jemand ohne Übertragungsrechte zum Projektarchiv kann so Änderungen vornehmen, diese Änderungen an eine Person mit Übertragungsrechten schicken, welche dann diese Änderungen übertragen kann. Oder man kann eine solche Patchdatei anderen zuerst zur Diskussion schicken, bevor man die Änderungen überträgt." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Wenn eine Arbeitskopie nur Änderungen an Textdateien aufweist, ist es möglich mit dem Diff-Befehl von Git eine Datei zu erstellen, welche diese Änderungen im Standard-Diff Format enthält. Eine Datei mit solchem Inhalt wird üblicherweise als Patch bezeichnet und kann zum Beispiel jemand anderem per Mail geschickt werden, der diese Änderungen dann in seine Arbeitskopie übernehmen kann. Jemand ohne Übertragungsrechte zum Projektarchiv kann so Änderungen vornehmen, diese Änderungen an eine Person mit Übertragungsrechten schicken, welche dann diese Änderungen übertragen kann. Oder man kann eine solche Patchdatei anderen zuerst zur Diskussion schicken, bevor man die Änderungen überträgt." #. (glossterm) #: ../source/TortoiseGit_en.xml:16048 @@ -14042,8 +14042,8 @@ msgstr "Eigenschaft" #. (para) #: ../source/TortoiseGit_en.xml:16050 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Zusätzlich zur Versionierung von Dateien und Ordnern erlaubt Subversion die Versionierung von Metadaten für Ordner und Dateien, auch als Eigenschaften bezeichnet. Jede Eigenschaft hat einen Namen und einen Wert, ähnlich wie ein Registrierungsschlüssel. Subversion selbst hat einige spezielle Eigenschaften definiert, welche intern benutzt werden, wie zum Beispiel svn:eol-style. TortoiseGit nutzt ebenfalls spezielle Eigenschaften, so zum Beispiel tsvn:logminsize. Sie können eigene Eigenschaften mit jedem Namen und Wert erstellen den sie möchten." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Zusätzlich zur Versionierung von Dateien und Ordnern erlaubt Git die Versionierung von Metadaten für Ordner und Dateien, auch als Eigenschaften bezeichnet. Jede Eigenschaft hat einen Namen und einen Wert, ähnlich wie ein Registrierungsschlüssel. Git selbst hat einige spezielle Eigenschaften definiert, welche intern benutzt werden, wie zum Beispiel svn:eol-style. TortoiseGit nutzt ebenfalls spezielle Eigenschaften, so zum Beispiel tsvn:logminsize. Sie können eigene Eigenschaften mit jedem Namen und Wert erstellen den sie möchten." #. (para) #: ../source/TortoiseGit_en.xml:16065 @@ -14072,8 +14072,8 @@ msgstr "Wenn sich Dateien in einer Arbeitskopie nach einem Zusammenführen in ei #. (para) #: ../source/TortoiseGit_en.xml:16105 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion hält eine lokale Basis-Kopie von jeder Datei in dem Zustand, in dem sie zuletzt aktualisiert wurde in der Arbeitskopie. Wenn Sie Änderungen gemacht haben und diese rückgängig machen wollen, können Sie den Befehl Rückgängig verwenden, um zurück zur Basisversion der Datei zu kommen." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git hält eine lokale Basis-Kopie von jeder Datei in dem Zustand, in dem sie zuletzt aktualisiert wurde in der Arbeitskopie. Wenn Sie Änderungen gemacht haben und diese rückgängig machen wollen, können Sie den Befehl Rückgängig verwenden, um zurück zur Basisversion der Datei zu kommen." #. (glossterm) #: ../source/TortoiseGit_en.xml:16114 @@ -14107,12 +14107,12 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:16146 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Eine häufig verwendete Abkürzung für Subversion" +msgid "A frequently-used abbreviation for Git." +msgstr "Eine häufig verwendete Abkürzung für Git" #. (para) #: ../source/TortoiseGit_en.xml:16149 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "Der Name des spezifischen Protokolls, das von svnserve genutzt wird." #. (para) @@ -14122,8 +14122,8 @@ msgstr "So wie Aktualisieren zu Revision den Zeitpunkt der Arbeit #. (para) #: ../source/TortoiseGit_en.xml:16172 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Dieser Subversionbefehl holt die neuesten Änderungen aus dem Projektarchiv in Ihre Arbeitskopie und führt dabei die Änderungen von anderen mit Ihren Änderungen zusammen." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Dieser Gitbefehl holt die neuesten Änderungen aus dem Projektarchiv in Ihre Arbeitskopie und führt dabei die Änderungen von anderen mit Ihren Änderungen zusammen." #. (glossterm) #: ../source/TortoiseGit_en.xml:16180 @@ -14161,26 +14161,26 @@ msgstr "Übersetzung" #~ msgid "username" #~ msgstr "Umbenennen" #~ msgid "" -#~ "Subversion uses the / as the path delimiter in all " +#~ "Git uses the / as the path delimiter in all " #~ "internal pathnames, and all pattern matching is done against this style " #~ "of path names. If you want to use a path delimiter in your ignore " #~ "pattern, be sure to use /, and not the Windows " #~ "backslash." #~ msgstr "" -#~ "Subversion verwendet das / Zeichen als Trenner in " +#~ "Git verwendet das / Zeichen als Trenner in " #~ "allen internen Pfadnamen und sämtliche Mustervergleiche werden mit dieser " #~ "Art der Pfaddarstellung durchgeführt. Wenn Sie ein Pfadtrennzeichen in " #~ "Ihrem Ausschlussmuster verwenden möchten, stellen Sie sicher, dass Sie " #~ "/, und nicht das Windows \\ " #~ "Trennzeichen verwenden." #~ msgid "" -#~ "Subversion uses this pattern matching against every path presented to it " +#~ "Git uses this pattern matching against every path presented to it " #~ "for action. These paths are generally relative to the directory being " #~ "acted upon for import, add, commit, etc. The matching pattern therefore " #~ "has to take account of the fact that there may or may not be path " #~ "components before the filename." #~ msgstr "" -#~ "Subversion benutzt diesen Mustervergleich für jeden Pfad, der für eine " +#~ "Git benutzt diesen Mustervergleich für jeden Pfad, der für eine " #~ "Aktion verwendet wird. Diese Pfade sind im Allgemeinen relativ zu dem " #~ "Verzeichnis, das importiert, hinzugefügt oder übertragen wird. Der " #~ "Mustervergleich muss demzufolge berücksichtigen, dass Pfade vor dem " @@ -14191,7 +14191,7 @@ msgstr "Übersetzung" #~ "Fred.c but not subdir/Fred.c. This " #~ "is significant if you add a folder which contains some files that you " #~ "want to be ignored, because those filenames will be preceded with the " -#~ "folder name when Subversion compares them with the ignore pattern." +#~ "folder name when Git compares them with the ignore pattern." #~ msgstr "" #~ "Falls Verzeichnisnamen in einem Pfad vorkommen, werden sie durch die " #~ "Platzhaltersuche nicht abgeschnitten. Das Muster Fred.*\n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -33,8 +33,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Un cliente de Subversion para Windows" +msgid "A Git client for Windows" +msgstr "Un cliente de Git para Windows" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -114,8 +114,8 @@ msgstr "Audiencia" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "Este libro está escrito para usuarios informáticos que quieren usar Subversion para manejar sus datos, pero no están cómodos usando el cliente de línea de comandos para hacerlo. Dado que TortoiseGit es una extensión del shell de Windows, se asume que el usuario está familiarizado con el Explorador de windows y sabe cómo usarlo." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "Este libro está escrito para usuarios informáticos que quieren usar Git para manejar sus datos, pero no están cómodos usando el cliente de línea de comandos para hacerlo. Dado que TortoiseGit es una extensión del shell de Windows, se asume que el usuario está familiarizado con el Explorador de windows y sabe cómo usarlo." #. (title) #: ../source/TortoiseGit_en.xml:84 @@ -134,18 +134,18 @@ msgstr "La expone qué es TortoiseGit, lo #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." -msgstr "En los le ofrecemos una breve introducción al sistema de control de revisiones Subversion que es la base de TortoiseGit. Está prestado de la documentación del proyecto Subversion y explica las diferentes formas de control de versiones y cómo funciona Subversion." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." +msgstr "En los le ofrecemos una breve introducción al sistema de control de revisiones Git que es la base de TortoiseGit. Está prestado de la documentación del proyecto Git y explica las diferentes formas de control de versiones y cómo funciona Git." #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." -msgstr "Incluso muchos de los usuarios de Subversion nunca tendrán que preparar un servidor por ellos mismos. El siguiente capítulo trata sobre cómo preparar dicho servidor, y es útil para los administradores." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgstr "Incluso muchos de los usuarios de Git nunca tendrán que preparar un servidor por ellos mismos. El siguiente capítulo trata sobre cómo preparar dicho servidor, y es útil para los administradores." #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr "El capítulo sobre el ilustra cómo se prepara un repositorio local, lo que es útil para probar Subversion y TortoiseGit utilizando un único PC. También le informa sobre las bases de la administración de repositorios, algo que también es relevante para los repositorios que se encuentran en un servidor." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr "El capítulo sobre el ilustra cómo se prepara un repositorio local, lo que es útil para probar Git y TortoiseGit utilizando un único PC. También le informa sobre las bases de la administración de repositorios, algo que también es relevante para los repositorios que se encuentran en un servidor." #. (para) #: ../source/TortoiseGit_en.xml:113 @@ -169,8 +169,8 @@ msgstr "La sección le muestra cómo puede i #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." -msgstr "La le muestra una correlación entre los comandos de TortoiseGit y sus equivalentes en el cliente de línea de comandos de Subversion svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." +msgstr "La le muestra una correlación entre los comandos de TortoiseGit y sus equivalentes en el cliente de línea de comandos de Git svn.exe." #. (title) #: ../source/TortoiseGit_en.xml:144 @@ -194,8 +194,8 @@ msgstr "Comunidad" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "Tanto TortoiseGit como Subversion están siendo desarrollados por una comunidad de gente que trabaja en estos proyectos. Provienen de diferentes países por todo el mundo y se juntan para crear programas estupendos." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "Tanto TortoiseGit como Git están siendo desarrollados por una comunidad de gente que trabaja en estos proyectos. Provienen de diferentes países por todo el mundo y se juntan para crear programas estupendos." #. (title) #: ../source/TortoiseGit_en.xml:180 @@ -244,13 +244,13 @@ msgstr "por ayudar con la documentación y en la caza de bugs" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "El libro de Subversion" +msgid "The Git Book" +msgstr "El libro de Git" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "por la gran introducción a Subversion y su capítulo 2 que hemos copiado aquí" +msgid "for the great introduction to Git and its chapter 2 which we copied here" +msgstr "por la gran introducción a Git y su capítulo 2 que hemos copiado aquí" #. (term) #: ../source/TortoiseGit_en.xml:225 @@ -363,13 +363,13 @@ msgstr "¿Qué es TortoiseGit?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." -msgstr "TortoiseGit es un cliente gratuito de código abierto para el sistema de control de versiones Subversion. Esto es, TortoiseGit maneja ficheros y directorios a lo largo del tiempo. Los ficheros se almacenan en un repositorio central. El repositorio es prácticamente lo mismo que un servidor de ficheros ordinario, salvo que recuerda todos los cambios que se hayan hecho a sus ficheros y directorios. Esto permite que pueda recuperar versiones antiguas de sus ficheros y examinar la historia de cuándo y cómo cambiaron sus datos, y quién hizo el cambio. Esta es la razón por la que mucha gente piensa que Subversion, y los sistemas de control de versiones en general, son una especie de máquinas del tiempo." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." +msgstr "TortoiseGit es un cliente gratuito de código abierto para el sistema de control de versiones Git. Esto es, TortoiseGit maneja ficheros y directorios a lo largo del tiempo. Los ficheros se almacenan en un repositorio central. El repositorio es prácticamente lo mismo que un servidor de ficheros ordinario, salvo que recuerda todos los cambios que se hayan hecho a sus ficheros y directorios. Esto permite que pueda recuperar versiones antiguas de sus ficheros y examinar la historia de cuándo y cómo cambiaron sus datos, y quién hizo el cambio. Esta es la razón por la que mucha gente piensa que Git, y los sistemas de control de versiones en general, son una especie de máquinas del tiempo." #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." -msgstr "Algunos sistemas de control de versiones también son sistemas de manejo de configuración del software (SCM). Estos sistemas están diseñados específicamente para manejar árboles de código fuente, y tienen muchas características que son específicas para el desarrollo de software - tales como el entendimiento nativo de los lenguajes de programación, o proporcionan herramientas para compilar software. Subversion, sin embargo, no es uno de estos sistemas; es un sistema general que puede ser utilizado para manejar cualquier colección de ficheros, incluyendo código fuente." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgstr "Algunos sistemas de control de versiones también son sistemas de manejo de configuración del software (SCM). Estos sistemas están diseñados específicamente para manejar árboles de código fuente, y tienen muchas características que son específicas para el desarrollo de software - tales como el entendimiento nativo de los lenguajes de programación, o proporcionan herramientas para compilar software. Git, sin embargo, no es uno de estos sistemas; es un sistema general que puede ser utilizado para manejar cualquier colección de ficheros, incluyendo código fuente." #. (title) #: ../source/TortoiseGit_en.xml:368 @@ -378,18 +378,18 @@ msgstr "Historia de TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "En 2002, Tim Kemp se dio cuenta que Subversion era un sistema de control de versiones muy bueno, pero le faltaba un buen cliente GUI. La idea de tener un cliente de Subversion integrado en el shell de Windows se inspiró por el cliente similar que ya existía para CVS llamado TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "En 2002, Tim Kemp se dio cuenta que Git era un sistema de control de versiones muy bueno, pero le faltaba un buen cliente GUI. La idea de tener un cliente de Git integrado en el shell de Windows se inspiró por el cliente similar que ya existía para CVS llamado TortoiseCVS." #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Tim estudió el código fuente de TortoiseCVS y lo utilizó como base de TortoiseGit. Entonces inició el proyecto, registró el dominio TortoiseGit.org y puso el código fuente en línea. Durante ese tiempo, Stefan Küng estaba buscando un sistema de control de versiones bueno y gratuito, y encontró Subversion y el código fuente de TortoiseGit. Como TortoiseGit todavía no estaba listo para usarse, se unió al proyecto y empezó a programar. Pronto reescribió la mayor parte del código existente y empezó a añadir comandos y características, hasta el punto de que no quedó nada del código original." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Tim estudió el código fuente de TortoiseCVS y lo utilizó como base de TortoiseGit. Entonces inició el proyecto, registró el dominio TortoiseGit.org y puso el código fuente en línea. Durante ese tiempo, Stefan Küng estaba buscando un sistema de control de versiones bueno y gratuito, y encontró Git y el código fuente de TortoiseGit. Como TortoiseGit todavía no estaba listo para usarse, se unió al proyecto y empezó a programar. Pronto reescribió la mayor parte del código existente y empezó a añadir comandos y características, hasta el punto de que no quedó nada del código original." #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." -msgstr "Según se fue estabilizando Subversion, atrajo más y más usuarios que también empezaron a utilizar TortoiseGit como su cliente de Subversion. Los usuarios de TortoiseGit se incrementaron rápidamente (y aún crecen día a día). Entonces Lübbe Onken se ofreció a ayudar con algunos iconos más vistosos y un logo para TortoiseGit. Y también se encarga de la página web y de administrar las traducciones." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgstr "Según se fue estabilizando Git, atrajo más y más usuarios que también empezaron a utilizar TortoiseGit como su cliente de Git. Los usuarios de TortoiseGit se incrementaron rápidamente (y aún crecen día a día). Entonces Lübbe Onken se ofreció a ayudar con algunos iconos más vistosos y un logo para TortoiseGit. Y también se encarga de la página web y de administrar las traducciones." #. (title) #: ../source/TortoiseGit_en.xml:399 @@ -398,8 +398,8 @@ msgstr "Características de TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." -msgstr "¿Qué hace de TortoiseGit tan buen cliente de Subversion?\t Aquí hay una pequeña lista de sus características." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." +msgstr "¿Qué hace de TortoiseGit tan buen cliente de Git?\t Aquí hay una pequeña lista de sus características." #. (term) #: ../source/TortoiseGit_en.xml:406 @@ -438,18 +438,18 @@ msgstr "El estado de cada carpeta y fichero versionado se indica por pequeños i #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Fácil acceso a los comandos de Subversion" +msgid "Easy access to Git commands" +msgstr "Fácil acceso a los comandos de Git" #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." -msgstr "Todos los comandos de Subversion están disponibles desde el menú contextual del explorador. TortoiseGit añade su propio submenú allí." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgstr "Todos los comandos de Git están disponibles desde el menú contextual del explorador. TortoiseGit añade su propio submenú allí." #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "Dado que TortoiseGit es un cliente de Subversion, también queremos enseñarle algunas de las características del propio Subversion:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" +msgstr "Dado que TortoiseGit es un cliente de Git, también queremos enseñarle algunas de las características del propio Git:" #. (term) #: ../source/TortoiseGit_en.xml:460 @@ -458,8 +458,8 @@ msgstr "Versionado de carpetas" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS sólo controla la historia de ficheros individuales, pero Subversion implementa un sistema virtual de ficheros versionados que sigue la pista de los cambios en todos los árboles de directorios en el tiempo. Los ficheros y los directorios están versionados. Como resultado, hay comandos reales en el lado del cliente como mover y copiar que operan en ficheros y directorios." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS sólo controla la historia de ficheros individuales, pero Git implementa un sistema virtual de ficheros versionados que sigue la pista de los cambios en todos los árboles de directorios en el tiempo. Los ficheros y los directorios están versionados. Como resultado, hay comandos reales en el lado del cliente como mover y copiar que operan en ficheros y directorios." #. (term) #: ../source/TortoiseGit_en.xml:475 @@ -488,8 +488,8 @@ msgstr "Elección de capas de red" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "Subversion tiene una noción abstracta del acceso al repositorio, haciéndo que la gente pueda implementar nuevos mecanismos de red fácilmente. El avanzado servidor de red de Subversion es un módulo para el servidor web Apache, que habla una variante de HTTP llamada WebDAV/DeltaV. Esto dota a Subversion una gran ventaja en estabilidad e interoperatividad, y proporciona varias características importantes gratis: autentificación, autorización, compresión de la transmisión y navegación del repositorio, por ejemplo. También está disponible un proceso servidor de Subversion independiente. Este servidor habla un protocolo propio que puede encapsularse fácilmente sobre ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "Git tiene una noción abstracta del acceso al repositorio, haciéndo que la gente pueda implementar nuevos mecanismos de red fácilmente. El avanzado servidor de red de Git es un módulo para el servidor web Apache, que habla una variante de HTTP llamada WebDAV/DeltaV. Esto dota a Git una gran ventaja en estabilidad e interoperatividad, y proporciona varias características importantes gratis: autentificación, autorización, compresión de la transmisión y navegación del repositorio, por ejemplo. También está disponible un proceso servidor de Git independiente. Este servidor habla un protocolo propio que puede encapsularse fácilmente sobre ssh." #. (term) #: ../source/TortoiseGit_en.xml:516 @@ -498,8 +498,8 @@ msgstr "Manejo de datos consistente" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." -msgstr "Subversion expresa las diferencias entre ficheros usando un algoritmo de diferenciación binario, que funciona exactamente igual tanto en ficheros de texto (legibles por los humanos) como en ficheros binarios (que no son legibles por nosotros). Ambos tipos de ficheros se almacenan igualmente comprimidos en el repositorio, y las diferencias se transmiten en ambas direcciones por la red." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgstr "Git expresa las diferencias entre ficheros usando un algoritmo de diferenciación binario, que funciona exactamente igual tanto en ficheros de texto (legibles por los humanos) como en ficheros binarios (que no son legibles por nosotros). Ambos tipos de ficheros se almacenan igualmente comprimidos en el repositorio, y las diferencias se transmiten en ambas direcciones por la red." #. (term) #: ../source/TortoiseGit_en.xml:529 @@ -508,8 +508,8 @@ msgstr "Etiquetado y creación de ramas eficiente" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." -msgstr "El coste de crear una rama o una etiqueta no necesita ser proporcional al tamaño del proyecto. Subversion crea ramas y etiquetas símplemente copiando el proyecto, utilizando un mecanismo similar a los vínculos duros. Por tanto estas operaciones llevan un tiempo pequeño y constante, y muy poco espacio en el repositorio." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgstr "El coste de crear una rama o una etiqueta no necesita ser proporcional al tamaño del proyecto. Git crea ramas y etiquetas símplemente copiando el proyecto, utilizando un mecanismo similar a los vínculos duros. Por tanto estas operaciones llevan un tiempo pequeño y constante, y muy poco espacio en el repositorio." #. (term) #: ../source/TortoiseGit_en.xml:542 @@ -518,8 +518,8 @@ msgstr "Extensibilidad" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Subversion no tiene lastre histórico; está implementado como una colección de librerías C compartidas con APIS bien definidas. Esto hace que Subversion sea extremadamente mantenible y se pueda utilizar por otras aplicaciones y lenguajes." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." +msgstr "Git no tiene lastre histórico; está implementado como una colección de librerías C compartidas con APIS bien definidas. Esto hace que Git sea extremadamente mantenible y se pueda utilizar por otras aplicaciones y lenguajes." #. (title) #: ../source/TortoiseGit_en.xml:558 @@ -663,23 +663,23 @@ msgstr "Conceptos básicos" #. (primary) #: ../source/TortoiseGit_en.xml:724 -msgid "Subversion book" -msgstr "Libro de Subversion" +msgid "Git book" +msgstr "Libro de Git" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." -msgstr "Este capítulo es una versión ligeramente modificada del mismo capítulo en el libro de Subversion. Una versión en línea del libreo de Subversion está disponible aquí: http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." +msgstr "Este capítulo es una versión ligeramente modificada del mismo capítulo en el libro de Git. Una versión en línea del libreo de Git está disponible aquí: http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." -msgstr "Este capítulo es una introducción corta e informal a Subversion. Si el control de versiones es nuevo para usted, este capítulo es definitivamente para usted. Empezamos con una discusión de los conceptos generales de control de versiones, nos hacemos camino dentro de las ideas específicas que hay tras Subversion, y mostramos algunos ejemplos sencillos de Subversion en acción." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." +msgstr "Este capítulo es una introducción corta e informal a Git. Si el control de versiones es nuevo para usted, este capítulo es definitivamente para usted. Empezamos con una discusión de los conceptos generales de control de versiones, nos hacemos camino dentro de las ideas específicas que hay tras Git, y mostramos algunos ejemplos sencillos de Git en acción." #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." -msgstr "Incluso aunque los ejemplos en este capítulo muestran a gente compartiendo colecciones de código fuente de programas, tenga en cuenta que Subversion puede manejar cualquier collección de ficheros - no está limitado a ayudar a los programadores de ordenadores." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." +msgstr "Incluso aunque los ejemplos en este capítulo muestran a gente compartiendo colecciones de código fuente de programas, tenga en cuenta que Git puede manejar cualquier collección de ficheros - no está limitado a ayudar a los programadores de ordenadores." #. (title) #. (title) @@ -699,8 +699,8 @@ msgstr "repositorio" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." -msgstr "Subversion es un sistema centralizado para compartir información. En su núcleo está un repositorio, que es un almacén central de datos. El respositorio almacena información en forma de un árbol de ficheros - una jerarquía típica de ficheros y directorios. Cualquier número de clientes se conectan al repositorio, y luego leen o esriben esos ficheros. Al escribir datos, el cliente hace que la información esté disponible para los otros; al leer los datos, el cliente recibe la información de los demás." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgstr "Git es un sistema centralizado para compartir información. En su núcleo está un repositorio, que es un almacén central de datos. El respositorio almacena información en forma de un árbol de ficheros - una jerarquía típica de ficheros y directorios. Cualquier número de clientes se conectan al repositorio, y luego leen o esriben esos ficheros. Al escribir datos, el cliente hace que la información esté disponible para los otros; al leer los datos, el cliente recibe la información de los demás." #. (title) #: ../source/TortoiseGit_en.xml:767 @@ -709,8 +709,8 @@ msgstr "Un sistema típico cliente/servidor" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." -msgstr "¿Y ésto por qué es interesante? Por ahora, eso suena a la definición típica de un servidor de ficheros típico. Y de hecho, el repositorio es una clase de servidores de ficheros, pero no el habitual. Lo que hace al repositorio de Subversion especial es que recuerda todos los cambios que alguna vez se hayan escrito en él: cada cambio en cada fichero, e incluso los cambios en el propio árbol de directorios, como el añadir, borrar o reorganizar ficheros y directorios." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgstr "¿Y ésto por qué es interesante? Por ahora, eso suena a la definición típica de un servidor de ficheros típico. Y de hecho, el repositorio es una clase de servidores de ficheros, pero no el habitual. Lo que hace al repositorio de Git especial es que recuerda todos los cambios que alguna vez se hayan escrito en él: cada cambio en cada fichero, e incluso los cambios en el propio árbol de directorios, como el añadir, borrar o reorganizar ficheros y directorios." #. (para) #: ../source/TortoiseGit_en.xml:780 @@ -783,8 +783,8 @@ msgstr "La solución copiar-modificar-fusionar" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." -msgstr "Subversion, CVS y otros sistemas de control de versiones utilizan un modelo copiar-modificar-fusionar como alternativa al bloqueo. En este modelo, el cliente de cada usuario lee el repositorio y crea una copia de trabajo personal del fichero o del proyecto. Luego, los usuarios trabajan en paralelo, modificando sus copias privadas. Finalmente, las copias privadas se fusionan juntas en una nueva versión final. El sistema de control de versiones a menudo ofrece ayuda en la fusión, pero al final la persona es la responsable de hacer que ocurra correctamente." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgstr "Git, CVS y otros sistemas de control de versiones utilizan un modelo copiar-modificar-fusionar como alternativa al bloqueo. En este modelo, el cliente de cada usuario lee el repositorio y crea una copia de trabajo personal del fichero o del proyecto. Luego, los usuarios trabajan en paralelo, modificando sus copias privadas. Finalmente, las copias privadas se fusionan juntas en una nueva versión final. El sistema de control de versiones a menudo ofrece ayuda en la fusión, pero al final la persona es la responsable de hacer que ocurra correctamente." #. (para) #: ../source/TortoiseGit_en.xml:907 @@ -825,18 +825,18 @@ msgstr "Hay una situación común donde el modelo bloquear-modificar-desbloquear #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" -msgstr "¿Qué hace Subversion?" +msgid "What does Git Do?" +msgstr "¿Qué hace Git?" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." -msgstr "Subversion utiliza la solución copiar-modificar-mezclar por defecto, y en muchos casos esto es todo lo que necesitará. Sin embargo, desde la Versión 1.2, Subversion también admite bloqueo de ficheros, por lo que si tiene ficheros no-fusionables, o si simplemente está forzado a una política de bloqueo por la dirección, Subversion seguirá teniendo las características que necesita." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." +msgstr "Git utiliza la solución copiar-modificar-mezclar por defecto, y en muchos casos esto es todo lo que necesitará. Sin embargo, desde la Versión 1.2, Git también admite bloqueo de ficheros, por lo que si tiene ficheros no-fusionables, o si simplemente está forzado a una política de bloqueo por la dirección, Git seguirá teniendo las características que necesita." #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" -msgstr "Subversion en acción" +msgid "Git in Action" +msgstr "Git en acción" #. (title) #: ../source/TortoiseGit_en.xml:991 @@ -850,28 +850,28 @@ msgstr "copia de trabajo" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." -msgstr "Ya ha oído hablar sobre las copias de trabajo; ahora le demostraremos cómo las crea y las utiliza el cliente de Subversion." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." +msgstr "Ya ha oído hablar sobre las copias de trabajo; ahora le demostraremos cómo las crea y las utiliza el cliente de Git." #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." -msgstr "Una copia de trabajo de Subversion es un árbol de directorios ordinario en su sistema local, conteniendo una colección de ficheros. Puede editar estos ficheros como desee, y si son ficheros de código fuente, puede compilar su programa de la forma habitual. Su copia de trabajo es su propia área de trabajo privada: Subversion nunca incorporará los cambios de otra gente, ni hará que sus cambios estén disponibles para los demás, a menos que se lo pida explícitamente." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgstr "Una copia de trabajo de Git es un árbol de directorios ordinario en su sistema local, conteniendo una colección de ficheros. Puede editar estos ficheros como desee, y si son ficheros de código fuente, puede compilar su programa de la forma habitual. Su copia de trabajo es su propia área de trabajo privada: Git nunca incorporará los cambios de otra gente, ni hará que sus cambios estén disponibles para los demás, a menos que se lo pida explícitamente." #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." -msgstr "Después de que haya hecho algunos cambios en los ficheros dentro de su copia de trabajo y haya verificado que funcionan correctamente, Subversion le provee de comandos para publicar sus cambios para los demás que trabajan con usted en su proyecto (escribiendo en el repositorio). Si los demás publican sus propios cambios, Subversion le provee de comandos para fusionar esos cambios dentro de su copia de trabajo (leyendo desde el repositorio)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgstr "Después de que haya hecho algunos cambios en los ficheros dentro de su copia de trabajo y haya verificado que funcionan correctamente, Git le provee de comandos para publicar sus cambios para los demás que trabajan con usted en su proyecto (escribiendo en el repositorio). Si los demás publican sus propios cambios, Git le provee de comandos para fusionar esos cambios dentro de su copia de trabajo (leyendo desde el repositorio)." #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." -msgstr "Una copia de trabajo también contiene algunos ficheros extra, creados y mantenidos por Subversion, para ayudarse a llevar a cabo esos comandos. En particular, cada directorio detnro de su copia de trabajo contiene un subdirectorio llamado .svn, también conocido como el directorio administrativo de la copia de trabajo. Los ficheros dentro de los directorios administrativos ayudan a Subversion a reconocer qué ficheros contienen cambios no publicados, y qué ficheros están desactualizados respecto al trabajo de los demás." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgstr "Una copia de trabajo también contiene algunos ficheros extra, creados y mantenidos por Git, para ayudarse a llevar a cabo esos comandos. En particular, cada directorio detnro de su copia de trabajo contiene un subdirectorio llamado .svn, también conocido como el directorio administrativo de la copia de trabajo. Los ficheros dentro de los directorios administrativos ayudan a Git a reconocer qué ficheros contienen cambios no publicados, y qué ficheros están desactualizados respecto al trabajo de los demás." #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." -msgstr "Un repositorio típico de Subversion a menudo contiene los ficheros (o el código fuente) de varios proyectos; usualmente, cada proyecto es un subdirectorio en el árbol de ficheros del repositorio. Con esta disposición, una copia de trabajo de un usuario normalmente corresponderán a un subárbol particular del repositorio." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgstr "Un repositorio típico de Git a menudo contiene los ficheros (o el código fuente) de varios proyectos; usualmente, cada proyecto es un subdirectorio en el árbol de ficheros del repositorio. Con esta disposición, una copia de trabajo de un usuario normalmente corresponderán a un subárbol particular del repositorio." #. (para) #: ../source/TortoiseGit_en.xml:1038 @@ -895,13 +895,13 @@ msgstr "Para obtener una copia de trabajo, primero debe obtenerbutton.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." -msgstr "Suponga que ha hecho cambios a button.c. Dado que el directorio .svn recuerda la fecha de modificación y los contenidos originales del fichero, Subversion puede decirle que ha cambiado el fichero. Sin embargo, Subversion no hace públicos sus cambios hasta que explícitamente se lo pida. El acto de publicar sus cambios se conoce más comúnmente como confirmar (o enviar) los cambios al repositorio." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgstr "Suponga que ha hecho cambios a button.c. Dado que el directorio .svn recuerda la fecha de modificación y los contenidos originales del fichero, Git puede decirle que ha cambiado el fichero. Sin embargo, Git no hace públicos sus cambios hasta que explícitamente se lo pida. El acto de publicar sus cambios se conoce más comúnmente como confirmar (o enviar) los cambios al repositorio." #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." -msgstr "Para publicar sus cambios para los demás, puede utilizar el comando de Subversion commit." +msgid "To publish your changes to others, you can use Git's commit command." +msgstr "Para publicar sus cambios para los demás, puede utilizar el comando de Git commit." #. (para) #: ../source/TortoiseGit_en.xml:1072 @@ -910,18 +910,18 @@ msgstr "Ahora que sus cambios a button.c se han confirmado #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." -msgstr "Suponga que tiene un colaborador, Sally, que obtuvo una copia de trabajo de /calc al mismo tiempo que usted. Cuando ha confirmado sus cambios en button.c, la copia de trabajo de Sally se queda sin cambios; Subversion sólo modifica las copias de trabajo cuando lo pide el usuario." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." +msgstr "Suponga que tiene un colaborador, Sally, que obtuvo una copia de trabajo de /calc al mismo tiempo que usted. Cuando ha confirmado sus cambios en button.c, la copia de trabajo de Sally se queda sin cambios; Git sólo modifica las copias de trabajo cuando lo pide el usuario." #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." -msgstr "Para poner al día su proyecto, Sally puede pedirle a Subversion actualizar su copia de trabajo, utilizando el comando de Subversion actualizar. Esto incorporará sus cambios en la copia de trabajo de Sally, junto con cualquier otro que se haya confirmado desde que ella lo obtuvo." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgstr "Para poner al día su proyecto, Sally puede pedirle a Git actualizar su copia de trabajo, utilizando el comando de Git actualizar. Esto incorporará sus cambios en la copia de trabajo de Sally, junto con cualquier otro que se haya confirmado desde que ella lo obtuvo." #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." -msgstr "Tenga en cuenta que Sally no necesita especificar qué ficheros actualizar; Subversion utiliza la información en el directorio .svn, y más información desde el repositorio, para decidir qué ficheros deben ponerse al día." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgstr "Tenga en cuenta que Sally no necesita especificar qué ficheros actualizar; Git utiliza la información en el directorio .svn, y más información desde el repositorio, para decidir qué ficheros deben ponerse al día." #. (title) #: ../source/TortoiseGit_en.xml:1103 @@ -930,8 +930,8 @@ msgstr "URLs de repositorio" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" -msgstr "Los repositorios de Subversion pueden ser accedidos por muchos métodos diversos - en discos locales, o a través de varios protocolos de red. La ruta de un repositorio es siempre, sin embargo, una URL. El esquema URL indica el método de acceso:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgstr "Los repositorios de Git pueden ser accedidos por muchos métodos diversos - en discos locales, o a través de varios protocolos de red. La ruta de un repositorio es siempre, sin embargo, una URL. El esquema URL indica el método de acceso:" #. (title) #: ../source/TortoiseGit_en.xml:1112 @@ -967,8 +967,8 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "Acceso utilizando el protocolo WebDAV a un servidor Apache configurado para Subversion." +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "Acceso utilizando el protocolo WebDAV a un servidor Apache configurado para Git." #. (literal) #: ../source/TortoiseGit_en.xml:1141 @@ -1013,8 +1013,8 @@ msgstr "Acceso TCP/IP autentificado y encriptado utilizando un protocolo propio #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." -msgstr "En su mayoría, las URLs de Subversion utilizan la sintaxis estándar, permitiendo que se especifiquen nombres de servidor y números de puertos como parte de la URL. El método de acceso file:// se utiliza normalmente para el acceso local, aunque puede utilizarse con rutas UNC a equipos en red. La URL por lo tanto toma la forma file://nombredeequipo/ruta/al/repositorio. Para la máquina local, la parte nombredeequipo de la URL debe estar o ausente o ser localhost. Por esta razón, las rutas locales normalmente aparecen con tres barras, file:///ruta/al/repositorio." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgstr "En su mayoría, las URLs de Git utilizan la sintaxis estándar, permitiendo que se especifiquen nombres de servidor y números de puertos como parte de la URL. El método de acceso file:// se utiliza normalmente para el acceso local, aunque puede utilizarse con rutas UNC a equipos en red. La URL por lo tanto toma la forma file://nombredeequipo/ruta/al/repositorio. Para la máquina local, la parte nombredeequipo de la URL debe estar o ausente o ser localhost. Por esta razón, las rutas locales normalmente aparecen con tres barras, file:///ruta/al/repositorio." #. (para) #: ../source/TortoiseGit_en.xml:1181 @@ -1073,8 +1073,8 @@ msgstr "Una operación svn commit puede publicar los cambios #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." -msgstr "En el repositorio, cada confirmación se trata como una transacción atómica: o bien todos los cambios de la confirmación se llevan a cabo, o bien ninguno de ellos se realiza. Subversion aplica esta atomicidad en caso de errores en el programa, errores del sistema, problemas de red, y otras acciones del usuario." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgstr "En el repositorio, cada confirmación se trata como una transacción atómica: o bien todos los cambios de la confirmación se llevan a cabo, o bien ninguno de ellos se realiza. Git aplica esta atomicidad en caso de errores en el programa, errores del sistema, problemas de red, y otras acciones del usuario." #. (para) #: ../source/TortoiseGit_en.xml:1238 @@ -1093,8 +1093,8 @@ msgstr "Números globales de revisión" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" -msgstr "Al contrario que la mayoría del resto de sistemas de control de versiones, los números de revisión de Subversion se aplican a árboles completos, no a los ficheros individuales. Cada número de revisión selecciona un árbol entero, un estado particular del repositorio tras algún cambio confirmado. Otra forma de verlo es pensar que la revisión N representa el estado del repositorio tras la confirmación N-ésima. Cuando un usuario de Subversion habla de la \"revision 5 de foo.c\", realmente quieren decir \"foo.c tal y como estaba en la revisión 5\". ¡Tenga en cuenta que, en general, las revisiones N y M de un fichero no tienen por qué ser diferentes!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgstr "Al contrario que la mayoría del resto de sistemas de control de versiones, los números de revisión de Git se aplican a árboles completos, no a los ficheros individuales. Cada número de revisión selecciona un árbol entero, un estado particular del repositorio tras algún cambio confirmado. Otra forma de verlo es pensar que la revisión N representa el estado del repositorio tras la confirmación N-ésima. Cuando un usuario de Git habla de la \"revision 5 de foo.c\", realmente quieren decir \"foo.c tal y como estaba en la revisión 5\". ¡Tenga en cuenta que, en general, las revisiones N y M de un fichero no tienen por qué ser diferentes!" #. (para) #: ../source/TortoiseGit_en.xml:1276 @@ -1155,8 +1155,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." -msgstr "Los cambios de Sally a integer.c aparecerán en su copia de trabajo, y su cambio estará aún presente en button.c. En este ejemplo, el texto de Makefile es idéntico en las revisiones 4, 5, y 6, pero Subversion marcará su copia de trabajo de Makefile con la revisión 6 para indicar que aún está actualizado. Por lo que, después de que haga una actualización limpia en la parte superior de su copia de trabajo, generalmente obtendrá exactamente una revisión del repositorio." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgstr "Los cambios de Sally a integer.c aparecerán en su copia de trabajo, y su cambio estará aún presente en button.c. En este ejemplo, el texto de Makefile es idéntico en las revisiones 4, 5, y 6, pero Git marcará su copia de trabajo de Makefile con la revisión 6 para indicar que aún está actualizado. Por lo que, después de que haga una actualización limpia en la parte superior de su copia de trabajo, generalmente obtendrá exactamente una revisión del repositorio." #. (title) #: ../source/TortoiseGit_en.xml:1325 @@ -1165,8 +1165,8 @@ msgstr "Cómo se unen las copias de trabajo al repositorio" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" -msgstr "Por cada fichero en un directorio de trabajo, Subversion grabará dos piezas esenciales de información en el área administrativa .svn/:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" +msgstr "Por cada fichero en un directorio de trabajo, Git grabará dos piezas esenciales de información en el área administrativa .svn/:" #. (para) #: ../source/TortoiseGit_en.xml:1332 @@ -1180,8 +1180,8 @@ msgstr "una fecha que indica cuándo se actualizó por última vez la copia loca #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" -msgstr "Con esta información, hablando con el repositorio, Subversion puede decirle en cuál de los siguientes cuatro estados está un fichero de trabajo:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" +msgstr "Con esta información, hablando con el repositorio, Git puede decirle en cuál de los siguientes cuatro estados está un fichero de trabajo:" #. (term) #: ../source/TortoiseGit_en.xml:1352 @@ -1220,8 +1220,8 @@ msgstr "Cambiado localmente, y desactualizado" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." -msgstr "El fichero se ha cambiado tanto en el directorio de trabajo como en el repositorio. Un comando confirmar sobre el fichero fallará con un error desactualizado. El fichero debería actualizarse primero; al actualizar se intentará fusionar los cambios públicos con los cambios locales. Si Subversion no puede completar la fusión de una forma plausible automáticamente, le dejará al usuario la tarea de resolver el conflicto." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgstr "El fichero se ha cambiado tanto en el directorio de trabajo como en el repositorio. Un comando confirmar sobre el fichero fallará con un error desactualizado. El fichero debería actualizarse primero; al actualizar se intentará fusionar los cambios públicos con los cambios locales. Si Git no puede completar la fusión de una forma plausible automáticamente, le dejará al usuario la tarea de resolver el conflicto." #. (title) #: ../source/TortoiseGit_en.xml:1412 @@ -1230,8 +1230,8 @@ msgstr "Sumario" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "Hemos cubierto un número de conceptos fundamentales de Subversion en este capítulo:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" +msgstr "Hemos cubierto un número de conceptos fundamentales de Git en este capítulo:" #. (para) #: ../source/TortoiseGit_en.xml:1419 @@ -1240,13 +1240,13 @@ msgstr "Hemos introducido las nociones de un repositorio central, la copia de tr #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." -msgstr "Hemos visto algunos ejemplos simples sobre cómo dos colaboradores pueden utilizar Subversion para publicar y recibir los cambios de uno a otro, utilizando el modelo 'copiar-modificar-fusionar'." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgstr "Hemos visto algunos ejemplos simples sobre cómo dos colaboradores pueden utilizar Git para publicar y recibir los cambios de uno a otro, utilizando el modelo 'copiar-modificar-fusionar'." #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." -msgstr "Hemos hablado un poco sobre la forma en la que Subversion controla y maneja la información en una copia de trabajo." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." +msgstr "Hemos hablado un poco sobre la forma en la que Git controla y maneja la información en una copia de trabajo." #. (title) #: ../source/TortoiseGit_en.xml:1445 @@ -1255,13 +1255,13 @@ msgstr "Preparando un servidor" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." -msgstr "Para utilizar TortoiseGit (o cualquier otro cliente de Subversion), necesita un lugar donde establecer sus repositorios. Puede o bien almacenar sus repositorios de forma local y acceder a ellos utilizando el protocolo file://, o puede ponerlos en un servidor y acceder a ellos con los protocolos http:// o svn://. Los dos protocolos de servidor también pueden estar encriptados. Utilice https:// o svn+ssh://. Este capítulo le muestra paso a paso cómo puede preparar uno de estos servidores en una máquina Windows." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgstr "Para utilizar TortoiseGit (o cualquier otro cliente de Git), necesita un lugar donde establecer sus repositorios. Puede o bien almacenar sus repositorios de forma local y acceder a ellos utilizando el protocolo file://, o puede ponerlos en un servidor y acceder a ellos con los protocolos http:// o svn://. Los dos protocolos de servidor también pueden estar encriptados. Utilice https:// o svn+ssh://. Este capítulo le muestra paso a paso cómo puede preparar uno de estos servidores en una máquina Windows." #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." -msgstr "Puede encontrar información más detallada sobre las opciones del servidor de Subversion, y sobre cómo elegir la mejor arquitectura para su situación, en el libro de Subversion bajo Configuración del servidor." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." +msgstr "Puede encontrar información más detallada sobre las opciones del servidor de Git, y sobre cómo elegir la mejor arquitectura para su situación, en el libro de Git bajo Configuración del servidor." #. (para) #: ../source/TortoiseGit_en.xml:1466 @@ -1285,8 +1285,8 @@ msgstr "Apache" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" -msgstr "La configuración más flexible de todas las instalaciones de servidor posibles para Subversion es la que se basa en Apache. Aunque es un poco más complicada de preparar, ofrece beneficios que otros servidores no pueden dar:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgstr "La configuración más flexible de todas las instalaciones de servidor posibles para Git es la que se basa en Apache. Aunque es un poco más complicada de preparar, ofrece beneficios que otros servidores no pueden dar:" #. (primary) #. (term) @@ -1297,8 +1297,8 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." -msgstr "El servidor de Subversion basado en Apache utiliza el protocolo WebDAV que se utiliza por muchos otros programas. Por ejemplo, podría montar dicho repositorio como una Carpeta web en el explorador de Windows y luego acceder a ella como cualquier otra carpeta en su sistema de ficheros." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgstr "El servidor de Git basado en Apache utiliza el protocolo WebDAV que se utiliza por muchos otros programas. Por ejemplo, podría montar dicho repositorio como una Carpeta web en el explorador de Windows y luego acceder a ella como cualquier otra carpeta en su sistema de ficheros." #. (term) #: ../source/TortoiseGit_en.xml:1509 @@ -1307,8 +1307,8 @@ msgstr "Navegando por el repositorio" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." -msgstr "Puede apuntar su navegador a la URL del repositorio y navegar por sus contenidos sin tener un cliente de Subversion. Esto da acceso a sus datos a un mayor círculo de usuarios." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." +msgstr "Puede apuntar su navegador a la URL del repositorio y navegar por sus contenidos sin tener un cliente de Git. Esto da acceso a sus datos a un mayor círculo de usuarios." #. (term) #. (title) @@ -1389,18 +1389,18 @@ msgstr "La primera cosa que necesita antes de instalar Apache es un ordenador co #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Instalando Subversion" +msgid "Installing Git" +msgstr "Instalando Git" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Descarge la última versión de los binarios de Subversion para Apache y Windows 32. Asegúrese de obtener la versión correcta para integrarla en su versión de Apache, porque si no obtendrá un oscuro mensaje de error cuando intente reiniciar. Si tiene Apache 2.2.x acuda a http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Descarge la última versión de los binarios de Git para Apache y Windows 32. Asegúrese de obtener la versión correcta para integrarla en su versión de Apache, porque si no obtendrá un oscuro mensaje de error cuando intente reiniciar. Si tiene Apache 2.2.x acuda a http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." -msgstr "Ejecute el instalador de Subversion y siga las instrucciones. Si el instalador de Subversion reconoce que ha instalado Apache, habrá casi terminado. Si no puede encontrar un servidor de Apache entonces tendrá que realizar algunos pasos adicionales." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgstr "Ejecute el instalador de Git y siga las instrucciones. Si el instalador de Git reconoce que ha instalado Apache, habrá casi terminado. Si no puede encontrar un servidor de Apache entonces tendrá que realizar algunos pasos adicionales." #. (primary) #. (primary) @@ -1411,13 +1411,13 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "Utilizando el explorador de Windows, vaya al directorio de instalación de Subversion (normalmente C:\\Archivos de programa\\Subversion) y busque los ficheros /httpd/mod_dav_svn.so y mod_authz_svn.so. Copie estos ficheros al directorio de módulos de Apache (normalmente C:\\Archivos de programa\\Apache Group\\Apache2\\modules)." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "Utilizando el explorador de Windows, vaya al directorio de instalación de Git (normalmente C:\\Archivos de programa\\Git) y busque los ficheros /httpd/mod_dav_svn.so y mod_authz_svn.so. Copie estos ficheros al directorio de módulos de Apache (normalmente C:\\Archivos de programa\\Apache Group\\Apache2\\modules)." #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." -msgstr "Copie el fichero /bin/libdb*.dll y /bin/intl3_svn.dll desde el directorio de instalación de Subversion al directorio bin de Apache." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." +msgstr "Copie el fichero /bin/libdb*.dll y /bin/intl3_svn.dll desde el directorio de instalación de Git al directorio bin de Apache." #. (para) #: ../source/TortoiseGit_en.xml:1677 @@ -1460,12 +1460,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "Al final del fichero de configuración, añada las siguientes líneas: \n" "<Location /svn>\n" @@ -1474,12 +1474,12 @@ msgstr "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Repositorios de Subversion\"\n" +" AuthName \"Repositorios de Git\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" Esto configura el Apache de forma que todos sus repositorios de Subversion están físicamente localizados bajo D:\\SVN. Los respositorios se sirven al mundo exterior desde la URL: http://MiServidor/svn/ . El acceso está restringido a los usuarios/contraseñas listados en el fichero passwd" +" Esto configura el Apache de forma que todos sus repositorios de Git están físicamente localizados bajo D:\\SVN. Los respositorios se sirven al mundo exterior desde la URL: http://MiServidor/svn/ . El acceso está restringido a los usuarios/contraseñas listados en el fichero passwd" #. (para) #: ../source/TortoiseGit_en.xml:1740 @@ -1503,13 +1503,13 @@ msgstr "Reinice el servicio de Apache de nuevo." #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "Apunte su navegador a http://MiServidor/svn/MiNuevoRepositorio (donde MiNuevoRepositorio es el nombre del repositorio de Subversion que creó antes). Si todo ha ido bien debería ver una ventana preguntando por un usuario y una contraseña, y luego podrá ver los contenidos de su repositorio." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "Apunte su navegador a http://MiServidor/svn/MiNuevoRepositorio (donde MiNuevoRepositorio es el nombre del repositorio de Git que creó antes). Si todo ha ido bien debería ver una ventana preguntando por un usuario y una contraseña, y luego podrá ver los contenidos de su repositorio." #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "Ahora ya ha preparado Apache y Subversion, pero Apache aún no sabe cómo manejar los clientes de Subversion como TortoiseGit. Para que Apache sepa qué URL debe utilizarse para los repositorios de Subversion debe editar el fichero de configuración de Apache (normalmente está en C:\\Archivos de programa\\Apache Group\\Apache2\\conf\\httpd.conf) con cualquier editor de texto que desee (por ejemplo, el Bloc de notas): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "Ahora ya ha preparado Apache y Git, pero Apache aún no sabe cómo manejar los clientes de Git como TortoiseGit. Para que Apache sepa qué URL debe utilizarse para los repositorios de Git debe editar el fichero de configuración de Apache (normalmente está en C:\\Archivos de programa\\Apache Group\\Apache2\\conf\\httpd.conf) con cualquier editor de texto que desee (por ejemplo, el Bloc de notas): " #. (primary) #: ../source/TortoiseGit_en.xml:1777 @@ -1547,18 +1547,18 @@ msgstr "http://MiServidor/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " -msgstr "significa que los repositorios de Subversion están disponibles en la URL " +msgid "means that the Git repositories are available from the URL " +msgstr "significa que los repositorios de Git están disponibles en la URL " #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "le dice a Apache qué módulo será responsable de servir esa URL - en este caso, el módulo de Subversion." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." +msgstr "le dice a Apache qué módulo será responsable de servir esa URL - en este caso, el módulo de Git." #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." -msgstr "Para Subversion 1.3 y superiores, esta directiva habilita el listado de todos los repositorios disponibles bajo ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." +msgstr "Para Git 1.3 y superiores, esta directiva habilita el listado de todos los repositorios disponibles bajo ." #. (filename) #: ../source/TortoiseGit_en.xml:1822 @@ -1567,8 +1567,8 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " -msgstr "le dice a Subversion que busque repositorios bajo " +msgid "tells Git to look for repositories below " +msgstr "le dice a Git que busque repositorios bajo " #. (entry) #: ../source/TortoiseGit_en.xml:1827 @@ -1592,8 +1592,8 @@ msgstr "especifica qué fichero de contraseñas se utiliza para la autentificaci #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "lugar del fichero de Acceso para las rutas dentro del repositorio de Subversion" +msgid "Location of the Access file for paths inside a Git repository" +msgstr "lugar del fichero de Acceso para las rutas dentro del repositorio de Git" #. (entry) #: ../source/TortoiseGit_en.xml:1861 @@ -1624,11 +1624,11 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "Utilizando un fichero passwd se limita y se otorga acceso a todos sus repositorios como si fueran uno solo. Si desea más control sobre qué usuarios tienen acceso a cada carpeta dentro de un repositorio, puede descomentar la línea \n" "#AuthzSVNAccessFile svnaccessfile\n" -" y crear un fichero de acceso de Subversion. Apache se asegurará que sólo los usuarios válidos pueden acceder su ruta /svn, y luego pasará el nombre de usuario al módulo de Subversion AuthzSVNAccessFile para que pueda forzar un acceso más controlado basado en las reglas que se especifican en el fichero de acceso de Subversion. Tenga en cuenta que las rutas se especifican o bien como repos:ruta o simplemente ruta. Si no especifica un repositorio en concreto, la regla de acceso se aplicará a todos los repositorios bajo SVNParentPath. El formato del fichero de política de autorización utilizado por mod_authz_svn se describe en " +" y crear un fichero de acceso de Git. Apache se asegurará que sólo los usuarios válidos pueden acceder su ruta /svn, y luego pasará el nombre de usuario al módulo de Git AuthzSVNAccessFile para que pueda forzar un acceso más controlado basado en las reglas que se especifican en el fichero de acceso de Git. Tenga en cuenta que las rutas se especifican o bien como repos:ruta o simplemente ruta. Si no especifica un repositorio en concreto, la regla de acceso se aplicará a todos los repositorios bajo SVNParentPath. El formato del fichero de política de autorización utilizado por mod_authz_svn se describe en " #. (para) #: ../source/TortoiseGit_en.xml:1915 @@ -1668,13 +1668,13 @@ msgstr "Índice de proyectos" #. (para) #: ../source/TortoiseGit_en.xml:1956 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." -msgstr "Si ha utilizado la directiva SVNParentPath no necesita cambiar el fichero de configuración de Apache cada vez que añada un nuevo repositorio de Subversion. Simplemente cree el nuevo repositorio bajo la misma ruta que el primer repositorio, ¡y ya está! En mi compañía, tengo acceso directo a esa carpeta en concreto utilizando SMB (el acceso normal de ficheros de Windows). Por lo que simplemente creo una nueva carpeta allí, ejecuto el comando de TortoiseGit TortoiseGitCrear repositorio aquí... y ya hay un nuevo proyecto que tiene su hogar..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgstr "Si ha utilizado la directiva SVNParentPath no necesita cambiar el fichero de configuración de Apache cada vez que añada un nuevo repositorio de Git. Simplemente cree el nuevo repositorio bajo la misma ruta que el primer repositorio, ¡y ya está! En mi compañía, tengo acceso directo a esa carpeta en concreto utilizando SMB (el acceso normal de ficheros de Windows). Por lo que simplemente creo una nueva carpeta allí, ejecuto el comando de TortoiseGit TortoiseGitCrear repositorio aquí... y ya hay un nuevo proyecto que tiene su hogar..." #. (para) #: ../source/TortoiseGit_en.xml:1970 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." -msgstr "Si está utilizando Subversion 1.3 o posterior, puede utilizar la directiva SVNListParentPath on para permitir que Apache produzca un listado de todos los proyectos disponibles si apunta su navegador a la ruta raíz en vez de a un repositorio en concreto." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgstr "Si está utilizando Git 1.3 o posterior, puede utilizar la directiva SVNListParentPath on para permitir que Apache produzca un listado de todos los proyectos disponibles si apunta su navegador a la ruta raíz en vez de a un repositorio en concreto." #. (title) #: ../source/TortoiseGit_en.xml:1978 @@ -1688,8 +1688,8 @@ msgstr "Autorización" #. (para) #: ../source/TortoiseGit_en.xml:1985 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." -msgstr "El módulo mod_authz_svn le permite un control detallado de los permisos de acceso basado en nombres de usuarios y rutas de repositorio. Esto está disponible si utiliza el servidor de Apache, y desde Subversion 1.3 también está disponible si utiliza svnserve." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." +msgstr "El módulo mod_authz_svn le permite un control detallado de los permisos de acceso basado en nombres de usuarios y rutas de repositorio. Esto está disponible si utiliza el servidor de Apache, y desde Git 1.3 también está disponible si utiliza svnserve." #. (para) #: ../source/TortoiseGit_en.xml:1991 @@ -1831,7 +1831,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2094 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1845,7 +1845,7 @@ msgid "" "SSPIOfferBasic On\n" " within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" -"Para que el localizador de Subversion utilice este tipo de autentificación tiene que cambiar la línea \n" +"Para que el localizador de Git utilice este tipo de autentificación tiene que cambiar la línea \n" "AuthType Basic\n" " por \n" "AuthType SSPI\n" @@ -1876,8 +1876,8 @@ msgstr "Para habilitar SSL en su servidor, vea el capítulo: AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." -msgstr "Los ficheros AuthzSVNAccessFile de Subversion distinguen mayúsculas y minúsculas respecto a los nombres de usuario (JuanPerez no es lo mismo que juanperez)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgstr "Los ficheros AuthzSVNAccessFile de Git distinguen mayúsculas y minúsculas respecto a los nombres de usuario (JuanPerez no es lo mismo que juanperez)." #. (para) #: ../source/TortoiseGit_en.xml:2146 @@ -1886,8 +1886,8 @@ msgstr "En el mundo de Microsoft, los dominios y nombres de usuarios de Windows #. (para) #: ../source/TortoiseGit_en.xml:2151 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." -msgstr "La diferencia puede morderle cuando utilice la autentificación SSPI ya que el dominio de Windows y los nombres de usuario se pasan a Subversion exactamente como los haya tecleado el usuario en la ventana. Internet Explorer a menudo pasa el nombre de usuario a Apache automáticamente utilizando el formato con el que se creó la cuenta." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgstr "La diferencia puede morderle cuando utilice la autentificación SSPI ya que el dominio de Windows y los nombres de usuario se pasan a Git exactamente como los haya tecleado el usuario en la ventana. Internet Explorer a menudo pasa el nombre de usuario a Apache automáticamente utilizando el formato con el que se creó la cuenta." #. (para) #: ../source/TortoiseGit_en.xml:2159 @@ -1896,8 +1896,8 @@ msgstr "El resultado final es que puede necesitar al menos dos entradas en su fi #. (para) #: ../source/TortoiseGit_en.xml:2167 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." -msgstr "Los registros de error y de acceso de Apache son su mejor aliado para descifrar problemas como estos, ya que le ayudarán a determinar la cadena de nombre de usuario pasada al módulo AuthzSVNAccessFile de Subversion. Puede que necesite experimentar con el formato exacto de la cadena del usuario en el svnaccessfile (por ejemplo, DOMINIO\\usuario en vez de DOMINIO//usuario) para conseguir que todo funcione." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgstr "Los registros de error y de acceso de Apache son su mejor aliado para descifrar problemas como estos, ya que le ayudarán a determinar la cadena de nombre de usuario pasada al módulo AuthzSVNAccessFile de Git. Puede que necesite experimentar con el formato exacto de la cadena del usuario en el svnaccessfile (por ejemplo, DOMINIO\\usuario en vez de DOMINIO//usuario) para conseguir que todo funcione." #. (title) #: ../source/TortoiseGit_en.xml:2181 @@ -1911,8 +1911,8 @@ msgstr "Autentificación múltiple" #. (para) #: ../source/TortoiseGit_en.xml:2185 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." -msgstr "También es posible tener más de un origen de autentificación para su repositorio de Subversion. Para conseguirlo, debe hacer que cada tipo de autentificación sea no-autoritario, para que Apache compruebe múltiples orígenes buscando un par usuario/contraseña que concuerden." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgstr "También es posible tener más de un origen de autentificación para su repositorio de Git. Para conseguirlo, debe hacer que cada tipo de autentificación sea no-autoritario, para que Apache compruebe múltiples orígenes buscando un par usuario/contraseña que concuerden." #. (para) #: ../source/TortoiseGit_en.xml:2191 @@ -1941,7 +1941,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1966,7 +1966,7 @@ msgstr "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Repositorios de Subversion\"\n" +" AuthName \"Repositorios de Git\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# Usuarios de Dominio NT.\n" @@ -2093,13 +2093,13 @@ msgstr "SSL e Internet Explorer" #. (para) #: ../source/TortoiseGit_en.xml:2340 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." -msgstr "Si está asegurando su servidor con SSL y utiliza la autentificación contra un dominio de Windows se encontrará que la navegación de repositorios con el Internet Explorer ya no funcionará. No se preocupe - es sólo que Internet Explorer no se puede autentificar. Los demás navegadores no tienen ese problema y tanto TortoiseGit como cualquier otro cliente de Subversion todavía podrán autentificarse." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." +msgstr "Si está asegurando su servidor con SSL y utiliza la autentificación contra un dominio de Windows se encontrará que la navegación de repositorios con el Internet Explorer ya no funcionará. No se preocupe - es sólo que Internet Explorer no se puede autentificar. Los demás navegadores no tienen ese problema y tanto TortoiseGit como cualquier otro cliente de Git todavía podrán autentificarse." #. (para) #: ../source/TortoiseGit_en.xml:2354 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." -msgstr "Defina una directiva separada <Location /ruta> en el fichero de configuración de Apache, y añada SSPIBasicPreferred On. Esto permitirá que IE se autentifique de nuevo, pero los demás navegadores y Subversion no se podrán autentificar contra esa ruta." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." +msgstr "Defina una directiva separada <Location /ruta> en el fichero de configuración de Apache, y añada SSPIBasicPreferred On. Esto permitirá que IE se autentifique de nuevo, pero los demás navegadores y Git no se podrán autentificar contra esa ruta." #. (para) #: ../source/TortoiseGit_en.xml:2364 @@ -2133,8 +2133,8 @@ msgstr "Forzando el acceso SSL" #. (para) #: ../source/TortoiseGit_en.xml:2396 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." -msgstr "Cuando haya preparado SSL para hacer su repositorio más seguro, puede que desee deshabilitar el acceso normal via no-SSL (http) y sólo permitir el acceso https. Para hacer esto, debería añadir otra directiva al bloque <Location> de Subversion: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." +msgstr "Cuando haya preparado SSL para hacer su repositorio más seguro, puede que desee deshabilitar el acceso normal via no-SSL (http) y sólo permitir el acceso https. Para hacer esto, debería añadir otra directiva al bloque <Location> de Git: SSLRequireSSL." #. (para) #: ../source/TortoiseGit_en.xml:2403 @@ -2145,7 +2145,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2158,7 +2158,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Repositorios de Subversion\"\n" +" AuthName \"Repositorios de Git\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2177,8 +2177,8 @@ msgstr "Enviado a la lista de correo de TortoiseGit por Nigel Green. ¡Gracias!" #. (para) #: ../source/TortoiseGit_en.xml:2425 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." -msgstr "En algunas configuraciones de servidor puede que necesite configurar un único servidor que contenga 2 hosts SSL virtuales: el primero para acceso web público, sin requerimientos de un certificado de cliente; el segundo, seguro requiriendo un certificado de cliente, y ejecutando un servidor Subversion." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." +msgstr "En algunas configuraciones de servidor puede que necesite configurar un único servidor que contenga 2 hosts SSL virtuales: el primero para acceso web público, sin requerimientos de un certificado de cliente; el segundo, seguro requiriendo un certificado de cliente, y ejecutando un servidor Git." #. (para) #: ../source/TortoiseGit_en.xml:2431 @@ -2188,11 +2188,11 @@ msgstr "Al añadir una directiva SSLVerifyClient Optional en #. (para) #: ../source/TortoiseGit_en.xml:2441 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" -"La solución es añadir la siguiente directiva en el directorio del host virtual que quiere bloquear para Subversion: \n" +"La solución es añadir la siguiente directiva en el directorio del host virtual que quiere bloquear para Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " Esta directiva da acceso al directorio sólo si se recibió y verificó correctamente un certificado de cliente." @@ -2210,10 +2210,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2235,10 +2235,10 @@ msgstr "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Configuración del virtual host para SUBVERSION \n" +"### Configuración del virtual host para Git \n" "### (necesita un certificado de cliente)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"ruta a la raiz del host de subversion\">\n" +" <Directory \"ruta a la raiz del host de Git\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2256,8 +2256,8 @@ msgstr "Servidor Basado en Svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2486 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." -msgstr "Puede haber situaciones donde no es posible utilizar Apache como servidor. Afortunadamente, Subversion incluye Svnserve - un ligero servidor aislado que utiliza un protocolo propio sobre una conexión TCP/IP ordinaria." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgstr "Puede haber situaciones donde no es posible utilizar Apache como servidor. Afortunadamente, Git incluye Svnserve - un ligero servidor aislado que utiliza un protocolo propio sobre una conexión TCP/IP ordinaria." #. (para) #: ../source/TortoiseGit_en.xml:2492 @@ -2271,23 +2271,23 @@ msgstr "Instalando svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2503 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." -msgstr "Obtenga la última versión de Subversion desde http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternativamente obtenga un instalador pre-empaquetado desde CollabNet en http://www.collab.net/downloads/subversion. Este instalador pondrá svnserve como un servicio de Windows, y también incluye algunas de las herramientas que necesitará si va a utilizar SASL para la seguridad." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgstr "Obtenga la última versión de Git desde http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternativamente obtenga un instalador pre-empaquetado desde CollabNet en http://www.collab.net/downloads/Git. Este instalador pondrá svnserve como un servicio de Windows, y también incluye algunas de las herramientas que necesitará si va a utilizar SASL para la seguridad." #. (para) #: ../source/TortoiseGit_en.xml:2517 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." -msgstr "Si ya tiene una versión de Subversion instalada, y svnserve se está ejecutando, necesitará pararlo antes de continuar." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." +msgstr "Si ya tiene una versión de Git instalada, y svnserve se está ejecutando, necesitará pararlo antes de continuar." #. (para) #: ../source/TortoiseGit_en.xml:2523 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." -msgstr "Ejecute el instalador de Subversion. Si ejecuta el instalador en su servidor (recomendado) puede saltarse el paso 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." +msgstr "Ejecute el instalador de Git. Si ejecuta el instalador en su servidor (recomendado) puede saltarse el paso 4." #. (para) #: ../source/TortoiseGit_en.xml:2529 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "Abra el explorador de Windows, vaya al directorio de instalación de Subversion (normalmenteC:\\Archivos de programa\\Subversion) y en el directorio bin, localice los ficheros svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll y ssleay32.dll - copie estos ficheros, o simplemente copie todo el contenido del directorio bin, a un directorio de su servidor, por ejemplo c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "Abra el explorador de Windows, vaya al directorio de instalación de Git (normalmenteC:\\Archivos de programa\\Git) y en el directorio bin, localice los ficheros svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll y ssleay32.dll - copie estos ficheros, o simplemente copie todo el contenido del directorio bin, a un directorio de su servidor, por ejemplo c:\\svnserve" #. (title) #: ../source/TortoiseGit_en.xml:2551 @@ -2357,36 +2357,36 @@ msgstr "Ejecutar svnserve como un servicio" #. (para) #: ../source/TortoiseGit_en.xml:2625 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." -msgstr "Ejecutar svnserve como un usuario normalmente no es la mejor forma de hacerlo. Eso significa que siempre debe haber un usuario con la sesión iniciada en su servidor, y que debe acordarse de iniciarlo de nuevo tras cada reinicio. Una manera mejor es ejecutar svnserve como un servicio de Windows. Desde la versión 1.4 de Subversion, svnserve puede instalarse como un servicio de Windows nativo." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." +msgstr "Ejecutar svnserve como un usuario normalmente no es la mejor forma de hacerlo. Eso significa que siempre debe haber un usuario con la sesión iniciada en su servidor, y que debe acordarse de iniciarlo de nuevo tras cada reinicio. Una manera mejor es ejecutar svnserve como un servicio de Windows. Desde la versión 1.4 de Git, svnserve puede instalarse como un servicio de Windows nativo." #. (para) #: ../source/TortoiseGit_en.xml:2632 msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Para instalar svnserve como un servicio de Windows nativo, ejecute el siguiente comando todo en una línea para crear un servicio que se arranque automáticamente cuando se inicie Windows. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " Si cualquiera de las rutas incluye espacios, tendrá que utilizar comillas (escapadas) en la ruta, como en este ejemplo: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Archivos de programa\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\"\n" +" \\\"C:\\Archivos de programa\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\"\n" " depend= tcpip start= auto\n" " También puede añadir una descripción después de crear el servicio; esta descripción se mostrará en el Administrador de Servicios de Windows. \n" -"sc description svnserve \"Servidor de Subversion (svnserve)\"\n" +"sc description svnserve \"Servidor de Git (svnserve)\"\n" "" #. (para) @@ -2399,11 +2399,11 @@ msgstr "Tenga en cuenta el formato no muy usual de la línea de comandos utiliza msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Microsoft ahora recomienda que los servicios se ejecuten o con la cuenta de Servicio Local o con la cuenta de Servicio de Red. Tiene más información en The Services and Service Accounts Security Planning Guide. Para crear el servicio bajo la cuenta de Servicio Local, añada lo siguiente al ejemplo anterior. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Tenga en cuenta que deberá proporcionar a la cuenta de Servicio Local los permisos apropiados tanto para Subversion como para sus repositorios, y también a cualquier aplicación que utilicen los scripts gancho. El grupo por defecto para esto se llama \"LOCAL SERVICE\"." +" Tenga en cuenta que deberá proporcionar a la cuenta de Servicio Local los permisos apropiados tanto para Git como para sus repositorios, y también a cualquier aplicación que utilicen los scripts gancho. El grupo por defecto para esto se llama \"LOCAL SERVICE\"." #. (para) #: ../source/TortoiseGit_en.xml:2679 @@ -2481,8 +2481,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2756 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" -msgstr "Si mantiene múltiples repositorios utilizando la misma base de datos de contraseñas, la utilización de un dominio de autentificación le hará la vida más fácil a los usuarios, dado que TortoiseGit puede almacenar en caché sus credenciales para que sólo tenga que introducirlas una vez. Se puede encontrar más información en el libro de Subversion, específicamente en las secciones Crear un fichero 'users' y un dominio y Caché de credenciales de cliente" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgstr "Si mantiene múltiples repositorios utilizando la misma base de datos de contraseñas, la utilización de un dominio de autentificación le hará la vida más fácil a los usuarios, dado que TortoiseGit puede almacenar en caché sus credenciales para que sólo tenga que introducirlas una vez. Se puede encontrar más información en el libro de Git, específicamente en las secciones Crear un fichero 'users' y un dominio y Caché de credenciales de cliente" #. (title) #: ../source/TortoiseGit_en.xml:2774 @@ -2501,13 +2501,13 @@ msgstr "¿Qué es SASL?" #. (para) #: ../source/TortoiseGit_en.xml:2780 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." -msgstr "La Capa de seguridad y autenticación simple Cyrus (Cyrus Simple Authentication and Security Layer) es un software de código abierto escrito por la Universidad de Carnegie Mellon. Añade capacidades genéricas de autenticación y encriptación a cualquier protocolo de red, y desde Subversion 1.5 y posteriores, tanto el servidor svnserve como el cliente TortoiseGit saben cómo hacer uso de esta biblioteca." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgstr "La Capa de seguridad y autenticación simple Cyrus (Cyrus Simple Authentication and Security Layer) es un software de código abierto escrito por la Universidad de Carnegie Mellon. Añade capacidades genéricas de autenticación y encriptación a cualquier protocolo de red, y desde Git 1.5 y posteriores, tanto el servidor svnserve como el cliente TortoiseGit saben cómo hacer uso de esta biblioteca." #. (para) #: ../source/TortoiseGit_en.xml:2788 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." -msgstr "Para una discusión más completa de las opciones disponibles, debería leer el libro de Subversion en la sección Utilizando svnserve con SASL. Si simplemente está buscando una forma sencilla para poner autenticación y encriptación en un servidor Windows, para que su repositorio pueda accederse seguramente a través del gran e inseguro Internet, siga leyendo." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgstr "Para una discusión más completa de las opciones disponibles, debería leer el libro de Git en la sección Utilizando svnserve con SASL. Si simplemente está buscando una forma sencilla para poner autenticación y encriptación en un servidor Windows, para que su repositorio pueda accederse seguramente a través del gran e inseguro Internet, siga leyendo." #. (title) #: ../source/TortoiseGit_en.xml:2801 @@ -2527,13 +2527,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2811 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." -msgstr "En segundo lugar, cree un fichero llamado svn.conf en un lugar conveniente - típicamente en el directorio donde está instalado Subversion." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." +msgstr "En segundo lugar, cree un fichero llamado svn.conf en un lugar conveniente - típicamente en el directorio donde está instalado Git." #. (para) #: ../source/TortoiseGit_en.xml:2816 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." -msgstr "En tercer lugar, cree dos nuevas entradas de registro para indicar a SASL dónde encontrar las cosas. Cree una clave de registro llamada [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] y ponga dos nuevos valores de cadena dentro: SearchPath establecido a la carpeta que contiene los plug-ins sasl*.dll (normalmente en la carpeta de instalación de Subversion), y ConfFile establecido a la carpeta que contiene el fichero svn.conf. Si ha utilizado el instalador CollabNet, estas claves de registro ya habrán sido creadas por usted." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgstr "En tercer lugar, cree dos nuevas entradas de registro para indicar a SASL dónde encontrar las cosas. Cree una clave de registro llamada [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] y ponga dos nuevos valores de cadena dentro: SearchPath establecido a la carpeta que contiene los plug-ins sasl*.dll (normalmente en la carpeta de instalación de Git), y ConfFile establecido a la carpeta que contiene el fichero svn.conf. Si ha utilizado el instalador CollabNet, estas claves de registro ya habrán sido creadas por usted." #. (para) #: ../source/TortoiseGit_en.xml:2828 @@ -2622,8 +2622,8 @@ msgstr "En tiene un método básico para prep #. (para) #: ../source/TortoiseGit_en.xml:2916 -msgid "Further information about svnserve can be found in the Version Control with Subversion." -msgstr "Puede encontrar más información sobre svnserve en el libro Control de versiones con Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." +msgstr "Puede encontrar más información sobre svnserve en el libro Control de versiones con Git." #. (title) #: ../source/TortoiseGit_en.xml:2924 @@ -2633,25 +2633,25 @@ msgstr "Autorización basada en rutas con svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2925 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" -"Empezando con Subversion 1.3, svnserve soporta el mismo esquema de autorización basada en rutas que está disponible en el módulo mod_authz_svn de Apache. Necesita editar el fichero conf/svnserve.conf dentro del directorio de su repositorio y añadir una línea refiriéndose a su fichero de autorización. \n" +"Empezando con Git 1.3, svnserve soporta el mismo esquema de autorización basada en rutas que está disponible en el módulo mod_authz_svn de Apache. Necesita editar el fichero conf/svnserve.conf dentro del directorio de su repositorio y añadir una línea refiriéndose a su fichero de autorización. \n" "[general]\n" "authz-db = authz\n" " Aquí, authz es un fichero que debe existir y que define los permisos de acceso. Puede utilizar un fichero separado por cada repositorio, o utilizar el mismo fichero para varios repositorios. Si desea una descripción del formato del fichero, lea ." #. (para) #: ../source/TortoiseGit_en.xml:2947 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." -msgstr "Sin importar el protocolo que use para acceder a sus repositorios, siempre necesita crear al menos un repositorio. Esto puede hacerse o bien con el cliente de línea de comandos de Subversion o con TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." +msgstr "Sin importar el protocolo que use para acceder a sus repositorios, siempre necesita crear al menos un repositorio. Esto puede hacerse o bien con el cliente de línea de comandos de Git o con TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:2952 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "Si todavía no ha creado un repositorio de Subversion, ahora es el momento de hacerlo." +msgid "If you haven't created a Git repository yet, it's time to do that now." +msgstr "Si todavía no ha creado un repositorio de Git, ahora es el momento de hacerlo." #. (title) #: ../source/TortoiseGit_en.xml:2960 @@ -2665,8 +2665,8 @@ msgstr "crear repositorio" #. (para) #: ../source/TortoiseGit_en.xml:2964 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." -msgstr "Puede crear un repositorio bajo el sistema FSFS o bien utilizando el anterior formato Berkeley Database (BDB). El formato FSFS es generalmente más rápido y más fácil de administrar, y funciona en unidades de red compartidas y en Windows 98 sin problemas. El formato BDB fue considerado durante un tiempo más estable simplemente porque se ha utilizado durante más tiempo, pero dado que FSFS se usa desde hace varios años, ese argumento ya no tiene mucho peso. Lea Eligiendo un almacén de datos en el libro de Subversion si desea más información." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." +msgstr "Puede crear un repositorio bajo el sistema FSFS o bien utilizando el anterior formato Berkeley Database (BDB). El formato FSFS es generalmente más rápido y más fácil de administrar, y funciona en unidades de red compartidas y en Windows 98 sin problemas. El formato BDB fue considerado durante un tiempo más estable simplemente porque se ha utilizado durante más tiempo, pero dado que FSFS se usa desde hace varios años, ese argumento ya no tiene mucho peso. Lea Eligiendo un almacén de datos en el libro de Git si desea más información." #. (title) #: ../source/TortoiseGit_en.xml:2979 @@ -2777,8 +2777,8 @@ msgstr "rutas UNC" #. (para) #: ../source/TortoiseGit_en.xml:3095 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." -msgstr "Para acceder a su repositorio local, necesita la ruta a esa carpeta. Recuerde que Subversion espera todas las rutas de repositorios con el formato file:///C:/RepositorioSVN/. Tenga en cuenta el uso de las barras de dividir." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgstr "Para acceder a su repositorio local, necesita la ruta a esa carpeta. Recuerde que Git espera todas las rutas de repositorios con el formato file:///C:/RepositorioSVN/. Tenga en cuenta el uso de las barras de dividir." #. (para) #: ../source/TortoiseGit_en.xml:3101 @@ -2817,8 +2817,8 @@ msgstr "En primer lugar, está dando a todos los usuarios acceso directo de escr #. (para) #: ../source/TortoiseGit_en.xml:3142 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." -msgstr "En segundo lugar, no todos los protocolos de compartición de ficheros de red soportan el bloqueo que Subversion necesita, por lo que puede encontrar que su repositorio se corrompe. Puede que no ocurra al principio, pero un día dos usuarios intentarán acceder al repositorio al mismo tiempo." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgstr "En segundo lugar, no todos los protocolos de compartición de ficheros de red soportan el bloqueo que Git necesita, por lo que puede encontrar que su repositorio se corrompe. Puede que no ocurra al principio, pero un día dos usuarios intentarán acceder al repositorio al mismo tiempo." #. (para) #: ../source/TortoiseGit_en.xml:3148 @@ -2921,8 +2921,8 @@ msgstr "Si adopta una aproximación de primer nivel /trunk /tags /bran #. (para) #: ../source/TortoiseGit_en.xml:3221 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." -msgstr "Para proyectos que no tienen que ver, puede preferir utilizar repositorios separados. Cuando confirma los cambios, lo que cambia es el número de revisión del repositorio completo, no el número de revisión del proyecto. Si tiene 2 proyectos que no tengan que ver compartiendo un repositorio, eso puede llevar a que ocurran grandes lagunas en los números de revisión. Los proyectos Subversion y TortoiseGit aparecen en el mismo servidor, pero son dos repositorios totalmente separados que permiten un desarrollo independiente, y no hay confusión sobre los números de compilación." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgstr "Para proyectos que no tienen que ver, puede preferir utilizar repositorios separados. Cuando confirma los cambios, lo que cambia es el número de revisión del repositorio completo, no el número de revisión del proyecto. Si tiene 2 proyectos que no tengan que ver compartiendo un repositorio, eso puede llevar a que ocurran grandes lagunas en los números de revisión. Los proyectos Git y TortoiseGit aparecen en el mismo servidor, pero son dos repositorios totalmente separados que permiten un desarrollo independiente, y no hay confusión sobre los números de compilación." #. (para) #: ../source/TortoiseGit_en.xml:3231 @@ -3010,8 +3010,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3333 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "La herramienta svnadmin se instala automáticamente cuando instala el cliente de línea de comandos de Subversion. Si está instalando las herramientas de línea de comandos en un PC con Windows, la mejor forma de hacerlo es descargar la versión con Windows installer. Está comprimido de forma más eficiente que la versión .zip, por lo que la descarga es menor, y se encarga de establecer las rutas por usted. Puede descargar la última versión del cliente de línea de comandos desde http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "La herramienta svnadmin se instala automáticamente cuando instala el cliente de línea de comandos de Git. Si está instalando las herramientas de línea de comandos en un PC con Windows, la mejor forma de hacerlo es descargar la versión con Windows installer. Está comprimido de forma más eficiente que la versión .zip, por lo que la descarga es menor, y se encarga de establecer las rutas por usted. Puede descargar la última versión del cliente de línea de comandos desde http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:3348 @@ -3037,8 +3037,8 @@ msgstr "scripts gancho en el lado del servidor" #. (para) #: ../source/TortoiseGit_en.xml:3358 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." -msgstr "Un script gancho es un programa que se activa por algún evento del repositorio, tal como la creación de una nueva revisión o la modificación de una propiedad no versionada. A cada gancho se le proporciona suficiente información para decirle qué evento es, sobre qué destino(s) se está operando, y el nombre de usuario de la persona que lanzó el evento. Dependiendo de la salida del gancho o del estado de vuelta, el programa gancho puede continuar la acción, detenerla, o suspenderla de alguna forma. Por favor lea Scripts gancho en el Libro de Subversion donde encontrará todos los detalles sobre la forma en la que están implementados los ganchos." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." +msgstr "Un script gancho es un programa que se activa por algún evento del repositorio, tal como la creación de una nueva revisión o la modificación de una propiedad no versionada. A cada gancho se le proporciona suficiente información para decirle qué evento es, sobre qué destino(s) se está operando, y el nombre de usuario de la persona que lanzó el evento. Dependiendo de la salida del gancho o del estado de vuelta, el programa gancho puede continuar la acción, detenerla, o suspenderla de alguna forma. Por favor lea Scripts gancho en el Libro de Git donde encontrará todos los detalles sobre la forma en la que están implementados los ganchos." #. (para) #: ../source/TortoiseGit_en.xml:3373 @@ -3089,8 +3089,8 @@ msgstr "sitio web" #. (para) #: ../source/TortoiseGit_en.xml:3413 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." -msgstr "Si desea hacer disponible su repositorio de Subversion a los demás, puede que desee incluir un vínculo a él desde su sitio web. Una forma de hacer esto más accesible es incluir un enlace de obtener para otros usuarios de TortoiseGit." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgstr "Si desea hacer disponible su repositorio de Git a los demás, puede que desee incluir un vínculo a él desde su sitio web. Una forma de hacer esto más accesible es incluir un enlace de obtener para otros usuarios de TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:3419 @@ -3138,18 +3138,18 @@ msgstr "Guía de uso diario" #. (para) #: ../source/TortoiseGit_en.xml:3452 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." -msgstr "Este documento describe el uso diario del cliente TortoiseGit. No es una introducción a los sistemas de control de versiones, y no es una introducción a Subversion (SVN). Es más como un lugar donde puede venir cuando sepa qué quiere hacer, pero no recuerde exactamente cómo hacerlo." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgstr "Este documento describe el uso diario del cliente TortoiseGit. No es una introducción a los sistemas de control de versiones, y no es una introducción a Git (SVN). Es más como un lugar donde puede venir cuando sepa qué quiere hacer, pero no recuerde exactamente cómo hacerlo." #. (para) #: ../source/TortoiseGit_en.xml:3460 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." -msgstr "Si necesita una introducción al control de versiones con Subversion, le recomendamos que se lea el fantástico libro: Control de versiones con Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." +msgstr "Si necesita una introducción al control de versiones con Git, le recomendamos que se lea el fantástico libro: Control de versiones con Git." #. (para) #: ../source/TortoiseGit_en.xml:3467 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." -msgstr "Este documento es también un trabajo en progreso, igual que lo son TortoiseGit y Subversion. Si encuentra algún error, por favor háganoslo saber en la lista de correo para que podamos actualizar la documentación. Algunas de las capturas de pantalla en la Guía de Uso Diario (GUD) puede que no reflejen el estado actual del software. Le rogamos nos disculpe. Trabajamos en TortoiseGit en nuestro tiempo libre." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgstr "Este documento es también un trabajo en progreso, igual que lo son TortoiseGit y Git. Si encuentra algún error, por favor háganoslo saber en la lista de correo para que podamos actualizar la documentación. Algunas de las capturas de pantalla en la Guía de Uso Diario (GUD) puede que no reflejen el estado actual del software. Le rogamos nos disculpe. Trabajamos en TortoiseGit en nuestro tiempo libre." #. (para) #: ../source/TortoiseGit_en.xml:3479 @@ -3163,13 +3163,13 @@ msgstr "Debe estar familiarizado con los sistemas de control de versiones." #. (para) #: ../source/TortoiseGit_en.xml:3489 -msgid "You should know the basics of Subversion." -msgstr "Debe conocer las bases de Subversion." +msgid "You should know the basics of Git." +msgstr "Debe conocer las bases de Git." #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should have set up a server and/or have access to a Subversion repository." -msgstr "Debe haber preparado un servidor y/o tener acceso a un repositorio de Subversion." +msgid "You should have set up a server and/or have access to a Git repository." +msgstr "Debe haber preparado un servidor y/o tener acceso a un repositorio de Git." #. (para) #: ../source/TortoiseGit_en.xml:3475 @@ -3358,13 +3358,13 @@ msgstr "svn.username contiene las credenciales para autenti #. (para) #: ../source/TortoiseGit_en.xml:3645 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " -msgstr "Si el repositorio al que intenta acceder está protegido por contraseña, aparecerá un diálogo de autentificación. Introduzca su usuario y contraseña. La casilla le permite que TortoiseGit almacene las credenciales en el directorio por defecto de Subversion: %APPDATA%\\Subversion\\auth, en tres subdirectorios: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " +msgstr "Si el repositorio al que intenta acceder está protegido por contraseña, aparecerá un diálogo de autentificación. Introduzca su usuario y contraseña. La casilla le permite que TortoiseGit almacene las credenciales en el directorio por defecto de Git: %APPDATA%\\Git\\auth, en tres subdirectorios: " #. (para) #: ../source/TortoiseGit_en.xml:3676 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." -msgstr "Si desea eliminar la caché de autentificación para todos los servidores, puede hacerlo desde la página Datos Almacenados del diálogo de configuración de TortoiseGit. Ese botón borrará todos los datos de autentificación cacheados de los directorios auth de Subversion, así como cualquier dato de autentificación almacenado en el registro por versiones anteriores de TortoiseGit. Lea ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgstr "Si desea eliminar la caché de autentificación para todos los servidores, puede hacerlo desde la página Datos Almacenados del diálogo de configuración de TortoiseGit. Ese botón borrará todos los datos de autentificación cacheados de los directorios auth de Git, así como cualquier dato de autentificación almacenado en el registro por versiones anteriores de TortoiseGit. Lea ." #. (para) #: ../source/TortoiseGit_en.xml:3685 @@ -3439,8 +3439,8 @@ msgstr "Es fácil importar en un nivel de carpetas erróneo en el repositorio." #. (para) #: ../source/TortoiseGit_en.xml:3731 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." -msgstr "Esta sección describe el comando importar de Subversion, que fue diseñado para importar una jerarquía de directorios en el repositorio de una vez. Aunque funciona, tiene algunos inconvenientes: Por estas razones le recomendamos que no utilice el comando importar en absoluto, y en cambio siga el método de dos pasos descrito en . Pero dado que ya está aquí, así es como funciona el comando importar básico ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgstr "Esta sección describe el comando importar de Git, que fue diseñado para importar una jerarquía de directorios en el repositorio de una vez. Aunque funciona, tiene algunos inconvenientes: Por estas razones le recomendamos que no utilice el comando importar en absoluto, y en cambio siga el método de dos pasos descrito en . Pero dado que ya está aquí, así es como funciona el comando importar básico ..." #. (para) #: ../source/TortoiseGit_en.xml:3763 @@ -3559,8 +3559,8 @@ msgstr "Por poner un ejemplo, puede mirar el script de compilación de TortoiseG #. (para) #: ../source/TortoiseGit_en.xml:3911 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." -msgstr "Para no molestar a los usuarios, también hemos añadido el fichero TortoiseVars.bat a la lista de ignorados de su carpeta padre, es decir, hemos cambiado la propiedad de Subversion svn:ignore para incluir ese nombre de fichero. De esta forma no se mostrará como no versionado en cada confirmación." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgstr "Para no molestar a los usuarios, también hemos añadido el fichero TortoiseVars.bat a la lista de ignorados de su carpeta padre, es decir, hemos cambiado la propiedad de Git svn:ignore para incluir ese nombre de fichero. De esta forma no se mostrará como no versionado en cada confirmación." #. (title) #: ../source/TortoiseGit_en.xml:3920 @@ -3587,17 +3587,17 @@ msgstr "A veces es útil construir una copia de trabajo que está hecho de un n #. (para) #: ../source/TortoiseGit_en.xml:3935 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" -"Digamos que obtiene una copia de trabajo de /project1 en D:\\dev\\project1. Seleccione la carpeta D:\\dev\\project1, haga click con el botón derecho y seleccione Menú de WindowsPropiedades del menú contextual. Aparece el diálogo Propiedades. Vaya a la pestaña de Subversion. Allí puede establecer las propiedades. Pulse Añadir.... Seleccione la propiedad svn:externals del desplegable y escriba en el cuadro de edición la URL del repositorio con el formato nombre url o, si desea especificar una revisión en concreto, name -rREV url. Puede añadir múltiples proyectos externos, uno por línea. Tenga en cuenta que las URLs deben estar correctamente codificadas o no funcionarán bien. Por ejemplo, debe reemplazar cada espacio por %20. Tenga en cuenta que no es posible utiilzar nombres de carpetas con espacios en ellos. Suponga que ha establecido estas propiedades en D:\\dev\\project1: \n" +"Digamos que obtiene una copia de trabajo de /project1 en D:\\dev\\project1. Seleccione la carpeta D:\\dev\\project1, haga click con el botón derecho y seleccione Menú de WindowsPropiedades del menú contextual. Aparece el diálogo Propiedades. Vaya a la pestaña de Git. Allí puede establecer las propiedades. Pulse Añadir.... Seleccione la propiedad svn:externals del desplegable y escriba en el cuadro de edición la URL del repositorio con el formato nombre url o, si desea especificar una revisión en concreto, name -rREV url. Puede añadir múltiples proyectos externos, uno por línea. Tenga en cuenta que las URLs deben estar correctamente codificadas o no funcionarán bien. Por ejemplo, debe reemplazar cada espacio por %20. Tenga en cuenta que no es posible utiilzar nombres de carpetas con espacios en ellos. Suponga que ha establecido estas propiedades en D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Ahora pulse Establecer y confirme sus cambios. Cuando usted (o cualquier otro usuario) actualice su copia de trabajo, Subversion creará una subcarpeta D:\\dev\\project1\\sounds y obtendrá el proyecto sounds, otra subcarpeta D:\\dev\\project1\\quick graphs que contendrá el proyecto graphics, y finalmente una subcarpeta anidada D:\\dev\\project1\\skins\\toolkit que contiene la revisión 21 del proyecto skin-maker." +" Ahora pulse Establecer y confirme sus cambios. Cuando usted (o cualquier otro usuario) actualice su copia de trabajo, Git creará una subcarpeta D:\\dev\\project1\\sounds y obtendrá el proyecto sounds, otra subcarpeta D:\\dev\\project1\\quick graphs que contendrá el proyecto graphics, y finalmente una subcarpeta anidada D:\\dev\\project1\\skins\\toolkit que contiene la revisión 21 del proyecto skin-maker." #. (para) #: ../source/TortoiseGit_en.xml:3975 @@ -3625,8 +3625,8 @@ msgstr "Si utiliza URLs absolutas en las definiciones svn:externalshttp://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." -msgstr "Para evitar dichos problemas, los clientes de Subversion versión 1.5 y superior soportan URLs externas relativas. Hay cuatro formas para especificar una URL relativa. En los siguientes ejemplos, asumimos que tenemos dos repositorios: uno en http://example.com/svn/repos-1 y otro en http://example.com/svn/repos-2. Tenemos una copia de trabajo de http://example.com/svn/repos-1/project/trunk en C:\\Working y la propiedad svn:externals está establecida en trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgstr "Para evitar dichos problemas, los clientes de Git versión 1.5 y superior soportan URLs externas relativas. Hay cuatro formas para especificar una URL relativa. En los siguientes ejemplos, asumimos que tenemos dos repositorios: uno en http://example.com/svn/repos-1 y otro en http://example.com/svn/repos-2. Tenemos una copia de trabajo de http://example.com/svn/repos-1/project/trunk en C:\\Working y la propiedad svn:externals está establecida en trunk." #. (term) #: ../source/TortoiseGit_en.xml:4026 @@ -3854,8 +3854,8 @@ msgstr "Repita el mismo proceso para Proyecto25." #. (para) #: ../source/TortoiseGit_en.xml:4293 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." -msgstr "Navegue a Proyecto76/SubProy y haga lo mismo. Esta vez notará que la carpeta Proyecto76 no tiene otro contenido que SubProy, que a su vez está totalmente poblado. Subversion ha creado las carpetas intermedias pero sin rellenarlas." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." +msgstr "Navegue a Proyecto76/SubProy y haga lo mismo. Esta vez notará que la carpeta Proyecto76 no tiene otro contenido que SubProy, que a su vez está totalmente poblado. Git ha creado las carpetas intermedias pero sin rellenarlas." #. (title) #: ../source/TortoiseGit_en.xml:4303 @@ -3864,8 +3864,8 @@ msgstr "La profundidad de la copia de trabajo no se puede reducir" #. (para) #: ../source/TortoiseGit_en.xml:4304 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." -msgstr "Una vez que haya obtenido una copia de trabajo hasta una profundidad en concreto puede incrementar esa profundidad más tarde para obtener más contenido. Sin embargo, no puede reducir de nuevo la profundidad para eliminar contenido. Esta funcionalidad puede que se añada en alguna versión posterior de Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." +msgstr "Una vez que haya obtenido una copia de trabajo hasta una profundidad en concreto puede incrementar esa profundidad más tarde para obtener más contenido. Sin embargo, no puede reducir de nuevo la profundidad para eliminar contenido. Esta funcionalidad puede que se añada en alguna versión posterior de Git." #. (title) #: ../source/TortoiseGit_en.xml:4312 @@ -4006,8 +4006,8 @@ msgstr "Las columnas que se muestran en el panel inferior son personalizables. S #. (para) #: ../source/TortoiseGit_en.xml:4490 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." -msgstr "Por defecto cuando confirma los cambios, cualquier bloqueo que tenga en los ficheros se libera automáticamente cuando la confirmación tiene éxito. Si desea mantener esos bloqueos, asegúrese de que la casilla Mantener bloqueos está marcada. El estado por defecto de esta casilla se toma de la opción no_unlock del fichero de configuración de Subversion. Lea para más información sobre cómo editar el fichero de configuración de Subversion." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." +msgstr "Por defecto cuando confirma los cambios, cualquier bloqueo que tenga en los ficheros se libera automáticamente cuando la confirmación tiene éxito. Si desea mantener esos bloqueos, asegúrese de que la casilla Mantener bloqueos está marcada. El estado por defecto de esta casilla se toma de la opción no_unlock del fichero de configuración de Git. Lea para más información sobre cómo editar el fichero de configuración de Git." #. (para) #: ../source/TortoiseGit_en.xml:4501 @@ -4030,8 +4030,8 @@ msgstr "Reparando renombrados externos" #. (para) #: ../source/TortoiseGit_en.xml:4518 #: ../source/TortoiseGit_en.xml:5319 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "A veces los ficheros se renombran fuera de Subversion, y se muestran en la lista de ficheros como un fichero faltante y un fichero no versionado. Para evitar perder la historia necesita notificar a Subversion su conexión. Simplemente seleccione tanto el nombre antiguo (faltante) como el nombre nuevo (sin versionar) y utilice Menú contextualReparar movimiento para emparejar los dos ficheros como un renombrado." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "A veces los ficheros se renombran fuera de Git, y se muestran en la lista de ficheros como un fichero faltante y un fichero no versionado. Para evitar perder la historia necesita notificar a Git su conexión. Simplemente seleccione tanto el nombre antiguo (faltante) como el nombre nuevo (sin versionar) y utilice Menú contextualReparar movimiento para emparejar los dos ficheros como un renombrado." #. (title) #. (title) @@ -4042,8 +4042,8 @@ msgstr "Listas de cambios" #. (para) #: ../source/TortoiseGit_en.xml:4534 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." -msgstr "El diálogo de confirmación da soporte a las listas de cambios de Subversion para ayudar a agrupar ficheros relacionados. Averigue más sobre esta característica en ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." +msgstr "El diálogo de confirmación da soporte a las listas de cambios de Git para ayudar a agrupar ficheros relacionados. Averigue más sobre esta característica en ." #. (title) #: ../source/TortoiseGit_en.xml:4541 @@ -4316,8 +4316,8 @@ msgstr "El fichero local ya existe" #. (para) #: ../source/TortoiseGit_en.xml:4863 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." -msgstr "A veces cuando intente actualizar, la actualización falla con un mensaje para decir que ya existe un fichero local con el mismo nombre. Esto típicamente ocurre cuando Subversion intenta obtener un fichero recién versionado, y se encuentra un fichero no versionado del mismo nombre en su copia de trabajo. Subversion nunca sobreescribirá un fichero no versionado - puede contener algo en lo que está trabajando, y que casualmente tiene el mismo nombre de fichero que otro desarrollador ha utilizado para su recién confirmado fichero." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgstr "A veces cuando intente actualizar, la actualización falla con un mensaje para decir que ya existe un fichero local con el mismo nombre. Esto típicamente ocurre cuando Git intenta obtener un fichero recién versionado, y se encuentra un fichero no versionado del mismo nombre en su copia de trabajo. Git nunca sobreescribirá un fichero no versionado - puede contener algo en lo que está trabajando, y que casualmente tiene el mismo nombre de fichero que otro desarrollador ha utilizado para su recién confirmado fichero." #. (para) #: ../source/TortoiseGit_en.xml:4872 @@ -4366,27 +4366,27 @@ msgstr "nombre-del-fichero.ext.rREV-NUEVA" #. (para) #: ../source/TortoiseGit_en.xml:4942 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." -msgstr "Este es el fichero que su cliente de Subversion acaba de recibir desde el servidor del que actualizó su copia de trabajo. Este fichero corresponde a la revisión HEAD del repositorio." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgstr "Este es el fichero que su cliente de Git acaba de recibir desde el servidor del que actualizó su copia de trabajo. Este fichero corresponde a la revisión HEAD del repositorio." #. (para) #: ../source/TortoiseGit_en.xml:4897 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" -"De vez en cuando, obtendrá un conflicto cuando actualiza sus ficheros desde el repositorio. Un conflicto ocurre cuando dos o más desarrolladores han hecho cambios en las mismas líneas de un fichero. Dado que Subversion no sabe nada de su proyecto, delega la resolución de los conflictos en los desarrolladores. Cuando se le informa de un conficto, debería abrir el fichero en cuestión, y buscar líneas que empiecen con el texto <<<<<<<. El área conflictiva se marca así: \n" +"De vez en cuando, obtendrá un conflicto cuando actualiza sus ficheros desde el repositorio. Un conflicto ocurre cuando dos o más desarrolladores han hecho cambios en las mismas líneas de un fichero. Dado que Git no sabe nada de su proyecto, delega la resolución de los conflictos en los desarrolladores. Cuando se le informa de un conficto, debería abrir el fichero en cuestión, y buscar líneas que empiecen con el texto <<<<<<<. El área conflictiva se marca así: \n" "<<<<<<< nombre-del-fichero\n" " sus cambios\n" "=======\n" " código fusionado del repositorio\n" ">>>>>>> revisión\n" -" Además, para cada fichero en conflicto Subversion deja tres ficheros adicionales en su directorio: " +" Además, para cada fichero en conflicto Git deja tres ficheros adicionales en su directorio: " #. (para) #: ../source/TortoiseGit_en.xml:4952 @@ -4400,8 +4400,8 @@ msgstr "Después, ejecute el comando TortoiseGit< #. (para) #: ../source/TortoiseGit_en.xml:4976 -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." -msgstr "Si tiene conflictos con ficheros binarios, Subversion no intentará mezclar dichos ficheros por si mismo. El fichero local se mantendrá sin cambios (exactamente tal y como lo había cambiado usted) y obtendrá unos ficheros nombrefichero.ext.r*. Si desea descartar sus cambios y quedarse con la versión del repositorio, utilice el comando Revertir. Si desea mantener su versión y sobreescribir la versión del repositorio, utilice el comando Resuelto y luego confirme su versión." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgstr "Si tiene conflictos con ficheros binarios, Git no intentará mezclar dichos ficheros por si mismo. El fichero local se mantendrá sin cambios (exactamente tal y como lo había cambiado usted) y obtendrá unos ficheros nombrefichero.ext.r*. Si desea descartar sus cambios y quedarse con la versión del repositorio, utilice el comando Revertir. Si desea mantener su versión y sobreescribir la versión del repositorio, utilice el comando Resuelto y luego confirme su versión." #. (para) #: ../source/TortoiseGit_en.xml:4986 @@ -4449,13 +4449,13 @@ msgstr "iconos" #. (para) #: ../source/TortoiseGit_en.xml:5028 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "Ahora que ha obtenido una copia de trabajo desde un repositorio de Subversion, puede ver sus ficheros en el explorador de Windows con los iconos cambiados. Ésta es una de las razones por las que TortoiseGit es tan popular. TortoiseGit añade lo que se llama un icono sobreimpresionado al icono de cada fichero que se superpone al icono original del fichero. Dependiendo del estado en Subversion del fichero, el icono sobreimpresionado es diferente." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." +msgstr "Ahora que ha obtenido una copia de trabajo desde un repositorio de Git, puede ver sus ficheros en el explorador de Windows con los iconos cambiados. Ésta es una de las razones por las que TortoiseGit es tan popular. TortoiseGit añade lo que se llama un icono sobreimpresionado al icono de cada fichero que se superpone al icono original del fichero. Dependiendo del estado en Git del fichero, el icono sobreimpresionado es diferente." #. (para) #: ../source/TortoiseGit_en.xml:5036 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " Una copia de trabajo recién obtenida tiene una marca verde como sobreimpresión. Esto significa que el estado de Subversion es normal." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " Una copia de trabajo recién obtenida tiene una marca verde como sobreimpresión. Esto significa que el estado de Git es normal." #. (para) #: ../source/TortoiseGit_en.xml:5041 @@ -4469,13 +4469,13 @@ msgstr " Si durante una actuali #. (para) #: ../source/TortoiseGit_en.xml:5054 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." -msgstr " Si ha establecido la propiedad svn:needs-lock en un fichero, Subversion establece ese fichero como de sólo-lectura hasta que obtenga un bloqueo en él. Estos ficheros tienen esta sobreimpresión para indicarle que debe obtener un bloqueo antes de que pueda editarlo." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgstr " Si ha establecido la propiedad svn:needs-lock en un fichero, Git establece ese fichero como de sólo-lectura hasta que obtenga un bloqueo en él. Estos ficheros tienen esta sobreimpresión para indicarle que debe obtener un bloqueo antes de que pueda editarlo." #. (para) #: ../source/TortoiseGit_en.xml:5061 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." -msgstr " Si ha obtenido un bloqueo sobre un fichero, y el estado de Subversion es normal, este icono sobreimpresionado le recordará que debería liberar el bloqueo si no lo está utilizando para permitir a los demás que puedan confirmar sus cambios en el fichero." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgstr " Si ha obtenido un bloqueo sobre un fichero, y el estado de Git es normal, este icono sobreimpresionado le recordará que debería liberar el bloqueo si no lo está utilizando para permitir a los demás que puedan confirmar sus cambios en el fichero." #. (para) #: ../source/TortoiseGit_en.xml:5068 @@ -4509,8 +4509,8 @@ msgstr "Ahora que hay más clilentes Tortoise por ahí (TortoiseCVS, TortoiseHG, #. (para) #: ../source/TortoiseGit_en.xml:5106 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." -msgstr "Si desea una descripción de cómo se corresponden las sobreimpresiones con los estados de Subversion y otros detalles técnicos, lea ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." +msgstr "Si desea una descripción de cómo se corresponden las sobreimpresiones con los estados de Git y otros detalles técnicos, lea ." #. (title) #: ../source/TortoiseGit_en.xml:5113 @@ -4946,8 +4946,8 @@ msgstr "Copia los detalles de registro de las revisiones seleccionadas al portap #. (para) #: ../source/TortoiseGit_en.xml:5724 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." -msgstr "Buscar en los mensajes de registro el texto que desee. Esto busca en los mensajes de registro que ha introducido, y también en los sumarios de acción creados por Subversion (mostrados en el panel inferior). La búsqueda no distingue mayúsculas y minúsculas." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." +msgstr "Buscar en los mensajes de registro el texto que desee. Esto busca en los mensajes de registro que ha introducido, y también en los sumarios de acción creados por Git (mostrados en el panel inferior). La búsqueda no distingue mayúsculas y minúsculas." #. (para) #: ../source/TortoiseGit_en.xml:5563 @@ -5033,8 +5033,8 @@ msgstr "Revertir los cambios hechos al fichero seleccionado en esa revisión." #. (para) #: ../source/TortoiseGit_en.xml:5825 -msgid "View the Subversion properties for the selected item." -msgstr "Ver las propiedades de Subversion del ítem seleccionado." +msgid "View the Git properties for the selected item." +msgstr "Ver las propiedades de Git del ítem seleccionado." #. (para) #: ../source/TortoiseGit_en.xml:5830 @@ -5058,18 +5058,18 @@ msgstr "Puede haberse dado cuenta de que a veces nos referimos a cambios y otras #. (para) #: ../source/TortoiseGit_en.xml:5847 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." -msgstr "Subversion utiliza números de revisión para dos cosas diferentes. Una revisión generalmente representa el estado de un repositorio en un momento en el tiempo, pero también puede utilizarse para representar el conjunto de cambios que generaron esa revisión; por ejemplo, Hecho en la r1234 significa que los cambios confirmados en la revisión 1234 implementan la característica X. Para dejar claro en qué sentido se utilizan, empleamos dos términos distintos." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgstr "Git utiliza números de revisión para dos cosas diferentes. Una revisión generalmente representa el estado de un repositorio en un momento en el tiempo, pero también puede utilizarse para representar el conjunto de cambios que generaron esa revisión; por ejemplo, Hecho en la r1234 significa que los cambios confirmados en la revisión 1234 implementan la característica X. Para dejar claro en qué sentido se utilizan, empleamos dos términos distintos." #. (para) #: ../source/TortoiseGit_en.xml:5856 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." -msgstr "Si selecciona dos revisiones N y M, el menú contextual le ofrecerá mostrar las diferencias entre estas dos revisiones. En términos de Subversion esto es diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." +msgstr "Si selecciona dos revisiones N y M, el menú contextual le ofrecerá mostrar las diferencias entre estas dos revisiones. En términos de Git esto es diff -r M:N." #. (para) #: ../source/TortoiseGit_en.xml:5862 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." -msgstr "Si selecciona una única revisión N, el menú contextual le ofrecerá mostrar los cambios realizados en esa revisión. En términos de Subversion esto es diff -r N-1:N o diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." +msgstr "Si selecciona una única revisión N, el menú contextual le ofrecerá mostrar los cambios realizados en esa revisión. En términos de Git esto es diff -r N-1:N o diff -c N." #. (para) #: ../source/TortoiseGit_en.xml:5868 @@ -5103,8 +5103,8 @@ msgstr "Cuando se invoca el diálogo Mostrar Registro desde el diálogo Fusionar #. (para) #: ../source/TortoiseGit_en.xml:5917 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." -msgstr "Tenga en cuenta que Subversion actualmente implementa el renombrado como un par de copia/borrado, por lo que renombrar un fichero o carpeta también provocará que el diálogo de registro se pare si se marca esta opción." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgstr "Tenga en cuenta que Git actualmente implementa el renombrado como un par de copia/borrado, por lo que renombrar un fichero o carpeta también provocará que el diálogo de registro se pare si se marca esta opción." #. (para) #: ../source/TortoiseGit_en.xml:5876 @@ -5143,8 +5143,8 @@ msgstr "historial de registro de fusión" #. (para) #: ../source/TortoiseGit_en.xml:5951 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." -msgstr "Subversion 1.5 y posteriores almacenan un registro de las fusiones utilizando propiedades. Esto nos permite obtener una historia más detallada de los cambios fusionados. Por ejemplo, si desarrolla una nueva característica en una rama y luego la fusiona en el tronco, la característica desarrollada aparecerá en el historial de registro del tronco como una única confirmación para la fusión, incluso aunque haya habido 1000 confirmaciones durante el desarrollo de la rama." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgstr "Git 1.5 y posteriores almacenan un registro de las fusiones utilizando propiedades. Esto nos permite obtener una historia más detallada de los cambios fusionados. Por ejemplo, si desarrolla una nueva característica en una rama y luego la fusiona en el tronco, la característica desarrollada aparecerá en el historial de registro del tronco como una única confirmación para la fusión, incluso aunque haya habido 1000 confirmaciones durante el desarrollo de la rama." #. (title) #: ../source/TortoiseGit_en.xml:5960 @@ -5178,8 +5178,8 @@ msgstr "A veces querrá cambiar un mensaje de registro que introdujo en su día, #. (para) #: ../source/TortoiseGit_en.xml:5992 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." -msgstr "Subversion le deja cambiar tanto el mensaje de registro como el autor de las revisiones en cualquier momento. Pero como estos cambios no se pueden deshacer (estos cambios no se versionan), esta característica está deshabilitada por defecto. Para hacer que ésto funcione, debe preparar un gancho pre-revprop-change. Por favor consulte el capítulo sobre Scripts gancho en el Libro de Subversion para tener más detalles sobre cómo hacerlo. Lea para encontrar más notas sobre cómo implementar ganchos en una máquina Windows." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgstr "Git le deja cambiar tanto el mensaje de registro como el autor de las revisiones en cualquier momento. Pero como estos cambios no se pueden deshacer (estos cambios no se versionan), esta característica está deshabilitada por defecto. Para hacer que ésto funcione, debe preparar un gancho pre-revprop-change. Por favor consulte el capítulo sobre Scripts gancho en el Libro de Git para tener más detalles sobre cómo hacerlo. Lea para encontrar más notas sobre cómo implementar ganchos en una máquina Windows." #. (para) #: ../source/TortoiseGit_en.xml:6005 @@ -5188,8 +5188,8 @@ msgstr "Una vez que haya preparado su servidor con los ganchos necesarios, puede #. (para) #: ../source/TortoiseGit_en.xml:6011 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." -msgstr "Dado que las propiedades de revisión de Subversion no se versionan, al hacer modificaciones a estas propiedades (por ejemplo, la propiedad del mensaje svn:log) se sobreescribirá el valor anterior de esa propiedad para siempre." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgstr "Dado que las propiedades de revisión de Git no se versionan, al hacer modificaciones a estas propiedades (por ejemplo, la propiedad del mensaje svn:log) se sobreescribirá el valor anterior de esa propiedad para siempre." #. (title) #: ../source/TortoiseGit_en.xml:6021 @@ -5442,8 +5442,8 @@ msgstr "Diferencias entre un fichero/carpeta en la copia de trabajo y una URL" #. (para) #: ../source/TortoiseGit_en.xml:6324 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." -msgstr "Si desea ver las diferencias entre un fichero en su copia de trabajo, y un fichero en cualquier repositorio de Subversion, puede hacerlo directamente en el explorador seleccionando el fichero y pulsando la tecla Mayúsculas mientras hace click con el botón derecho para obtener el menú contextual. Seleccione TortoiseGitDiferenciar con URL. Puede hacer lo mismo para una carpeta de copia de trabajo. TortoiseMerge muestra esas diferencias de la misma forma que muestra un fichero de parche - una lista de ficheros cambiados que puede ver de uno en uno." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgstr "Si desea ver las diferencias entre un fichero en su copia de trabajo, y un fichero en cualquier repositorio de Git, puede hacerlo directamente en el explorador seleccionando el fichero y pulsando la tecla Mayúsculas mientras hace click con el botón derecho para obtener el menú contextual. Seleccione TortoiseGitDiferenciar con URL. Puede hacer lo mismo para una carpeta de copia de trabajo. TortoiseMerge muestra esas diferencias de la misma forma que muestra un fichero de parche - una lista de ficheros cambiados que puede ver de uno en uno." #. (term) #: ../source/TortoiseGit_en.xml:6342 @@ -5837,8 +5837,8 @@ msgstr "etiqueta" #. (para) #: ../source/TortoiseGit_en.xml:6768 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." -msgstr "A menudo ocurre que ya tiene los ficheros que necesita en otro proyecto en su repositorio, y que simplemente quiere copiarlos. Podría simplemente copiar los ficheros y añadirlos como se describe más arriba, pero eso no le dará ninguna historia. Y si posteriormente arregla un error en los ficheros originales, sólo podrá fusionar el arreglo automáticamente si la nueva copia está relacionada con la original en Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." +msgstr "A menudo ocurre que ya tiene los ficheros que necesita en otro proyecto en su repositorio, y que simplemente quiere copiarlos. Podría simplemente copiar los ficheros y añadirlos como se describe más arriba, pero eso no le dará ninguna historia. Y si posteriormente arregla un error en los ficheros originales, sólo podrá fusionar el arreglo automáticamente si la nueva copia está relacionada con la original en Git." #. (para) #: ../source/TortoiseGit_en.xml:6776 @@ -5917,8 +5917,8 @@ msgstr "La lista global de ignorados" #. (para) #: ../source/TortoiseGit_en.xml:6888 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." -msgstr "Otra forma de ignorar ficheros es añadirlos a la lista global de ignorados. La mayor diferencia aquí es que la lista global de ignorados es una propiedad del cliente. Se aplica a todos los proyectos de Subversion, pero sólo en el PC cliente. En general es mejor utilizar la propiedad svn:ignore donde sea posible, porque puede aplicarse a áreas del proyecto específicas, y funciona para todos los que obtengan el proyecto. Para más información, lea la ." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgstr "Otra forma de ignorar ficheros es añadirlos a la lista global de ignorados. La mayor diferencia aquí es que la lista global de ignorados es una propiedad del cliente. Se aplica a todos los proyectos de Git, pero sólo en el PC cliente. En general es mejor utilizar la propiedad svn:ignore donde sea posible, porque puede aplicarse a áreas del proyecto específicas, y funciona para todos los que obtengan el proyecto. Para más información, lea la ." #. (title) #: ../source/TortoiseGit_en.xml:6901 @@ -5927,8 +5927,8 @@ msgstr "Ignorando ítems versionados" #. (para) #: ../source/TortoiseGit_en.xml:6902 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." -msgstr "Los ficheros y las carpetas verisonadas nunca pueden ser ignoradas - esta es una característica de Subversion. Si ha versionado un fichero por error, lea para ver las instrucciones sobre cómo desversionarlo." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." +msgstr "Los ficheros y las carpetas verisonadas nunca pueden ser ignoradas - esta es una característica de Git. Si ha versionado un fichero por error, lea para ver las instrucciones sobre cómo desversionarlo." #. (title) #: ../source/TortoiseGit_en.xml:6910 @@ -5977,13 +5977,13 @@ msgstr "Concuerda con cualquiera de los caracteres incluídos entre los corchete #. (para) #: ../source/TortoiseGit_en.xml:6917 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " -msgstr "El patrón de ignorados de Subversion hace uso de la expansión de comodines en los nombres de los ficheros, una técnica que originariamente se utilizaba en Unix para especificar ficheros utilizando meta-caracteres como son los comodines. Los siguientes caracteres tienen un significado especial: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgstr "El patrón de ignorados de Git hace uso de la expansión de comodines en los nombres de los ficheros, una técnica que originariamente se utilizaba en Unix para especificar ficheros utilizando meta-caracteres como son los comodines. Los siguientes caracteres tienen un significado especial: " #. (para) #: ../source/TortoiseGit_en.xml:6957 -msgid "Subversion uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." -msgstr "Subversion utiliza la / como el delimitador de ruta en todos los nombres de ruta internos, y todas las concordancias de patrones se hacen contra este estilo de nombres de rutas. Si desea utilizar un delimitador de ruta en su patrón de ignorado, asegúrese de utilizar /, y no la barra invertida de Windows." +msgid "Git uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." +msgstr "Git utiliza la / como el delimitador de ruta en todos los nombres de ruta internos, y todas las concordancias de patrones se hacen contra este estilo de nombres de rutas. Si desea utilizar un delimitador de ruta en su patrón de ignorado, asegúrese de utilizar /, y no la barra invertida de Windows." #. (para) #: ../source/TortoiseGit_en.xml:6963 @@ -5992,13 +5992,13 @@ msgstr "La concordancia de patrones distingue entre mayúsculas y minúsculas, l #. (para) #: ../source/TortoiseGit_en.xml:6970 -msgid "Subversion uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." -msgstr "Subversion utiliza esta concordancia de patrones contra cada ruta que se le presenta para la acción. Estas rutas son generalmente relativas al directorio contra el que se realiza la importación, añadido, confirmación, etc. El patrón de concordancia por lo tanto tiene que tener el cuenta el hecho de que puede o no haber partes de ruta antes del nombre del fichero." +msgid "Git uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." +msgstr "Git utiliza esta concordancia de patrones contra cada ruta que se le presenta para la acción. Estas rutas son generalmente relativas al directorio contra el que se realiza la importación, añadido, confirmación, etc. El patrón de concordancia por lo tanto tiene que tener el cuenta el hecho de que puede o no haber partes de ruta antes del nombre del fichero." #. (para) #: ../source/TortoiseGit_en.xml:6977 -msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Subversion compares them with the ignore pattern." -msgstr "Si hay nombres de directorios presentes en una ruta, el algoritmo de concordancia no los eliminará, por lo que el patrón Fred.* concuerda con Fred.c pero no con subdir/Fred.c. Esto es importante sobre todo si añade una carpeta que contiene algunos ficheros que desea ignorar, dado que dichos ficheros vendrán precedidos por el nombre de la carpeta cuando Subversion los compare con el patrón de ignorar." +msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Git compares them with the ignore pattern." +msgstr "Si hay nombres de directorios presentes en una ruta, el algoritmo de concordancia no los eliminará, por lo que el patrón Fred.* concuerda con Fred.c pero no con subdir/Fred.c. Esto es importante sobre todo si añade una carpeta que contiene algunos ficheros que desea ignorar, dado que dichos ficheros vendrán precedidos por el nombre de la carpeta cuando Git los compare con el patrón de ignorar." #. (para) #: ../source/TortoiseGit_en.xml:6986 @@ -6027,8 +6027,8 @@ msgstr "Menú contextual del explorador para ficheros versionados" #. (para) #: ../source/TortoiseGit_en.xml:7012 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " -msgstr "Al contrario que CVS, Subversion le permite renombrar y mover ficheros y carpetas. Por tanto hay entradas de menú para borrar y renombrar en el submenú TortoiseGit. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgstr "Al contrario que CVS, Git le permite renombrar y mover ficheros y carpetas. Por tanto hay entradas de menú para borrar y renombrar en el submenú TortoiseGit. " #. (title) #: ../source/TortoiseGit_en.xml:7022 @@ -6047,8 +6047,8 @@ msgstr "eliminar" #. (para) #: ../source/TortoiseGit_en.xml:7029 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." -msgstr "Utilice TortoiseGitEliminar para eliminar ficheros o carpetas de Subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." +msgstr "Utilice TortoiseGitEliminar para eliminar ficheros o carpetas de Git." #. (para) #: ../source/TortoiseGit_en.xml:7037 @@ -6057,8 +6057,8 @@ msgstr "Cuando TortoiseGitEliminaTortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." -msgstr "Cuando se utiliza TortoiseGitEliminar sobre una carpeta, ésta continúa en su copia de trabajo, pero la sobreimpresión cambia para indicarle que está marcada para ser eliminada. Hasta que confirme el cambio, puede recuperar la carpeta utilizando TortoiseGitRevertir sobre la propia carpeta. Esta diferencia en el comportamiento entre ficheros y carpetas es parte de Subversion, no de TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." +msgstr "Cuando se utiliza TortoiseGitEliminar sobre una carpeta, ésta continúa en su copia de trabajo, pero la sobreimpresión cambia para indicarle que está marcada para ser eliminada. Hasta que confirme el cambio, puede recuperar la carpeta utilizando TortoiseGitRevertir sobre la propia carpeta. Esta diferencia en el comportamiento entre ficheros y carpetas es parte de Git, no de TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:7070 @@ -6067,13 +6067,13 @@ msgstr "Si desea eliminar un ítem del repositorio, pero mantenerlo localmente c #. (para) #: ../source/TortoiseGit_en.xml:7081 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." -msgstr "Si se borra un fichero utilizando el Explorador en vez de usar el menú contextual de TortoiseGit, el diálogo de confirmación le muestra esos ficheros y le deja eliminarlos del control de versiones antes de confirmar. Sin embargo, si actualiza su copia de trabajo, Subversion se dará cuenta de que falta un fichero y lo reemplazará con la última versión del repositorio. Si necesita borrar un fichero bajo control de versiones, utilice siempre TortoiseGitEliminar para que Subversion no tenga que averiguar qué es lo que realmente quiere hacer usted." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." +msgstr "Si se borra un fichero utilizando el Explorador en vez de usar el menú contextual de TortoiseGit, el diálogo de confirmación le muestra esos ficheros y le deja eliminarlos del control de versiones antes de confirmar. Sin embargo, si actualiza su copia de trabajo, Git se dará cuenta de que falta un fichero y lo reemplazará con la última versión del repositorio. Si necesita borrar un fichero bajo control de versiones, utilice siempre TortoiseGitEliminar para que Git no tenga que averiguar qué es lo que realmente quiere hacer usted." #. (para) #: ../source/TortoiseGit_en.xml:7095 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." -msgstr "Si se borra una carpeta utilizando el Explorador en vez de utilizar el menú contextual de TortoiseGit, su copia de trabajo se romperá y no podrá confirmar. Si actualiza su copia de trabajo, Subversion reemplazará la carpeta que falta con la última versión del repositorio, y luego podrá eliminarla de la forma correcta, utilizando TortoiseGitEliminar." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgstr "Si se borra una carpeta utilizando el Explorador en vez de utilizar el menú contextual de TortoiseGit, su copia de trabajo se romperá y no podrá confirmar. Si actualiza su copia de trabajo, Git reemplazará la carpeta que falta con la última versión del repositorio, y luego podrá eliminarla de la forma correcta, utilizando TortoiseGitEliminar." #. (title) #: ../source/TortoiseGit_en.xml:7108 @@ -6166,13 +6166,13 @@ msgstr "cambio en mayúsculas y minúsculas" #. (para) #: ../source/TortoiseGit_en.xml:7224 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." -msgstr "Hacer cambios sólo en las mayúsculas/minúsculas de un nombre de fichero es complicado en Subversion sobre Windows, porque durante un corto periodo de tiempo durante el renombrado, ambos nombres de fichero deben existir. Dado que Windows tiene un sistema de ficheros que no distingue mayúsculas y minúsculas, esto no funciona utilizando el habitual comando Renombrar." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgstr "Hacer cambios sólo en las mayúsculas/minúsculas de un nombre de fichero es complicado en Git sobre Windows, porque durante un corto periodo de tiempo durante el renombrado, ambos nombres de fichero deben existir. Dado que Windows tiene un sistema de ficheros que no distingue mayúsculas y minúsculas, esto no funciona utilizando el habitual comando Renombrar." #. (para) #: ../source/TortoiseGit_en.xml:7230 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" -msgstr "Afortunadamente hay (al menos) dos soluciones posibles para renombrar un fichero sin perder su historia de registro. Es importante renombrarlo dentro de Subversion. ¡Renombrarlo únicamente en el explorador corromperá su copia de trabajo!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" +msgstr "Afortunadamente hay (al menos) dos soluciones posibles para renombrar un fichero sin perder su historia de registro. Es importante renombrarlo dentro de Git. ¡Renombrarlo únicamente en el explorador corromperá su copia de trabajo!" #. (para) #: ../source/TortoiseGit_en.xml:7240 @@ -6223,8 +6223,8 @@ msgstr "Lidiando con conflictos en las mayúsculas/minúsculas de un nombre de f #. (para) #: ../source/TortoiseGit_en.xml:7286 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." -msgstr "En el caso de que tenga dos ficheros en el repositorio con el mismo nombre pero diferenciándose únicamente en las mayúsculas (por ejemplo, TEST.TXT y test.txt), ya no podrá actualizar u obtener el directorio padre en un cliente de Windows. Aunque Subversion soporta los nombres de ficheros que se distinguen en las mayúsculas, Windows no." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." +msgstr "En el caso de que tenga dos ficheros en el repositorio con el mismo nombre pero diferenciándose únicamente en las mayúsculas (por ejemplo, TEST.TXT y test.txt), ya no podrá actualizar u obtener el directorio padre en un cliente de Windows. Aunque Git soporta los nombres de ficheros que se distinguen en las mayúsculas, Windows no." #. (para) #: ../source/TortoiseGit_en.xml:7294 @@ -6253,13 +6253,13 @@ msgstr "Reparando renombrados de ficheros" #. (para) #: ../source/TortoiseGit_en.xml:7318 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." -msgstr "A veces su amistoso IDE renombrará ficheros por usted como parte de un ejercicio de refactorización, y por supuesto no se lo dirá a Subversion. Si intenta confirmar sus cambios, Subversion verá el nombre de fichero antiguo como faltante y el nuevo nombre como fichero no versionado. Podría simplemente confirmar el nuevo nombre de fichero para añadirlo, pero entonces perdería la traza de la historia, ya que Subversion no sabe la relación entre los ficheros." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." +msgstr "A veces su amistoso IDE renombrará ficheros por usted como parte de un ejercicio de refactorización, y por supuesto no se lo dirá a Git. Si intenta confirmar sus cambios, Git verá el nombre de fichero antiguo como faltante y el nuevo nombre como fichero no versionado. Podría simplemente confirmar el nuevo nombre de fichero para añadirlo, pero entonces perdería la traza de la historia, ya que Git no sabe la relación entre los ficheros." #. (para) #: ../source/TortoiseGit_en.xml:7326 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Una forma mejor es notificar a Subversion de que el cambio es realmente un renombrado, y puede hacer esto dentro de los diálogos Confirmar y Comprobar modificaciones. Simplemente seleccione tanto el nombre de fichero antiguo (faltante) como el nuevo nombre (no versionado) y utilice Menú contextualReparar movimiento para emparejar los dos ficheros como un renombrado." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Una forma mejor es notificar a Git de que el cambio es realmente un renombrado, y puede hacer esto dentro de los diálogos Confirmar y Comprobar modificaciones. Simplemente seleccione tanto el nombre de fichero antiguo (faltante) como el nuevo nombre (no versionado) y utilice Menú contextualReparar movimiento para emparejar los dos ficheros como un renombrado." #. (title) #: ../source/TortoiseGit_en.xml:7340 @@ -6268,8 +6268,8 @@ msgstr "Eliminando ficheros no versionados" #. (para) #: ../source/TortoiseGit_en.xml:7341 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." -msgstr "Normalmente especifica un la lista de ignorados tal que todos los ficheros generados se ignoran en Subversion. Pero ¿y si lo que quiere es limpiar todos esos ítems ignorados para producir una compilación limpia? Normalmente lo haría en su makefile (fichero de instrucciones de compilación), pero si está depurando el makefile, o cambiando el sistema de compilación, es útil tener una forma de barrer la casa." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgstr "Normalmente especifica un la lista de ignorados tal que todos los ficheros generados se ignoran en Git. Pero ¿y si lo que quiere es limpiar todos esos ítems ignorados para producir una compilación limpia? Normalmente lo haría en su makefile (fichero de instrucciones de compilación), pero si está depurando el makefile, o cambiando el sistema de compilación, es útil tener una forma de barrer la casa." #. (para) #: ../source/TortoiseGit_en.xml:7348 @@ -6363,13 +6363,13 @@ msgstr "limpieza" #. (para) #: ../source/TortoiseGit_en.xml:7443 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." -msgstr "Si un comando de Subversion no puede completarse de forma correcta, quizás por problemas en el servidor, su copia de trabajo puede quedarse en un estado inconsistente. En ese caso deberá utilizar TortoiseGitLimpiar en la carpeta. Es una buena idea hacerlo en la rama superior de la copia de trabajo." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgstr "Si un comando de Git no puede completarse de forma correcta, quizás por problemas en el servidor, su copia de trabajo puede quedarse en un estado inconsistente. En ese caso deberá utilizar TortoiseGitLimpiar en la carpeta. Es una buena idea hacerlo en la rama superior de la copia de trabajo." #. (para) #: ../source/TortoiseGit_en.xml:7454 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." -msgstr "El comando Limpiar tiene otro efecto secundario muy útil. Si ha cambiado la fecha de un fichero pero no su contenido, Subversion no puede determinar si el fichero ha cambiado realmente excepto haciendo una comparación byte-a-byte con la copia prístina. Si tiene muchos ficheros en este estado, comprobar su estado será muy lento, lo que hará que muchos diálogos ralenticen su respuesta. Ejecutando el comando Limpiar en su copia de trabajo reparará esas fechas rotas y restaurará las comprobaciones de estado a la máxima velocidad." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgstr "El comando Limpiar tiene otro efecto secundario muy útil. Si ha cambiado la fecha de un fichero pero no su contenido, Git no puede determinar si el fichero ha cambiado realmente excepto haciendo una comparación byte-a-byte con la copia prístina. Si tiene muchos ficheros en este estado, comprobar su estado será muy lento, lo que hará que muchos diálogos ralenticen su respuesta. Ejecutando el comando Limpiar en su copia de trabajo reparará esas fechas rotas y restaurará las comprobaciones de estado a la máxima velocidad." #. (title) #: ../source/TortoiseGit_en.xml:7465 @@ -6378,8 +6378,8 @@ msgstr "Utilizar fechas de confirmación" #. (para) #: ../source/TortoiseGit_en.xml:7466 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." -msgstr "Algunas versiones anteriores de Subversion estaban afectadas con un error que causaba errores en la fecha cuando obtenía con la opción Utilizar fechas de confirmación activada. Utilice el comando Limpieza para acelerar esas copias de trabajo." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgstr "Algunas versiones anteriores de Git estaban afectadas con un error que causaba errores en la fecha cuando obtenía con la opción Utilizar fechas de confirmación activada. Utilice el comando Limpieza para acelerar esas copias de trabajo." #. (title) #: ../source/TortoiseGit_en.xml:7476 @@ -6393,38 +6393,38 @@ msgstr "propiedades" #. (title) #: ../source/TortoiseGit_en.xml:7482 -msgid "Explorer property page, Subversion tab" -msgstr "Página de propiedades del Explorador, pestaña Subversion" +msgid "Explorer property page, Git tab" +msgstr "Página de propiedades del Explorador, pestaña Git" #. (para) #: ../source/TortoiseGit_en.xml:7480 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." -msgstr " A veces desea obtener información más detallada sobre un fichero o directorio que la que proporcionan los iconos sobreimpresionados. Puede obtener toda la información que Subversion proporciona en el diálogo de propiedades del explorador. Simplemente seleccione el fichero o directorio y seleccione Menú de WindowsPropiedades en el menú contextual (atención: ésta es la entrada normal del menú de propiedades que el explorador proporciona, ¡no la que está en el submenú de TortoiseGit!). En el cuadro de diálogo de propiedades, TortoiseGit ha añadido una nueva página de propiedades para los ficheros y carpetas bajo control de Subversion, donde puede ver toda la información relevante sobre el fichero/directorio seleccionado." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." +msgstr " A veces desea obtener información más detallada sobre un fichero o directorio que la que proporcionan los iconos sobreimpresionados. Puede obtener toda la información que Git proporciona en el diálogo de propiedades del explorador. Simplemente seleccione el fichero o directorio y seleccione Menú de WindowsPropiedades en el menú contextual (atención: ésta es la entrada normal del menú de propiedades que el explorador proporciona, ¡no la que está en el submenú de TortoiseGit!). En el cuadro de diálogo de propiedades, TortoiseGit ha añadido una nueva página de propiedades para los ficheros y carpetas bajo control de Git, donde puede ver toda la información relevante sobre el fichero/directorio seleccionado." #. (title) #: ../source/TortoiseGit_en.xml:7502 -msgid "Subversion Properties" -msgstr "Propiedades de Subversion" +msgid "Git Properties" +msgstr "Propiedades de Git" #. (primary) #: ../source/TortoiseGit_en.xml:7504 -msgid "Subversion properties" -msgstr "Propiedades de Subversion" +msgid "Git properties" +msgstr "Propiedades de Git" #. (title) #: ../source/TortoiseGit_en.xml:7510 -msgid "Subversion property page" -msgstr "Página de propiedades de Subversion" +msgid "Git property page" +msgstr "Página de propiedades de Git" #. (para) #: ../source/TortoiseGit_en.xml:7508 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." -msgstr " Puede leer y establecer las propiedades de Subversion desde el diálogo de propiedades de Windows, pero también desde TortoiseGitPropiedades y dentro de las listas de estado de TortoiseGit, desde Menú contextualPropiedades." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgstr " Puede leer y establecer las propiedades de Git desde el diálogo de propiedades de Windows, pero también desde TortoiseGitPropiedades y dentro de las listas de estado de TortoiseGit, desde Menú contextualPropiedades." #. (para) #: ../source/TortoiseGit_en.xml:7525 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." -msgstr "Puede añadir sus propias propiedades, o algunas propiedades con un significado especial en Subversion. Éstas empiezan con svn:. svn:externals es una de esas propiedades; vea cómo manejar externos en ." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgstr "Puede añadir sus propias propiedades, o algunas propiedades con un significado especial en Git. Éstas empiezan con svn:. svn:externals es una de esas propiedades; vea cómo manejar externos en ." #. (title) #: ../source/TortoiseGit_en.xml:7532 @@ -6468,18 +6468,18 @@ msgstr "Una combinación comprimida de las cuatro palabras clave anteriores." #. (para) #: ../source/TortoiseGit_en.xml:7539 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " -msgstr "Subversion soporta expansión de palabras clave similar a CVS, lo que puede utilizarse para introducir el nombre del fichero y la información de la revisión dentro del propio fichero. Las palabras clave actualmente soportadas son: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgstr "Git soporta expansión de palabras clave similar a CVS, lo que puede utilizarse para introducir el nombre del fichero y la información de la revisión dentro del propio fichero. Las palabras clave actualmente soportadas son: " #. (para) #: ../source/TortoiseGit_en.xml:7590 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." -msgstr "Para averiguar cómo utilizar estas palabras clave, lea la sección svn:keywords del libro de Subversion, que porporciona información completa sobre estas palabras clave y cómo habilitarlas y utilizarlas." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." +msgstr "Para averiguar cómo utilizar estas palabras clave, lea la sección svn:keywords del libro de Git, que porporciona información completa sobre estas palabras clave y cómo habilitarlas y utilizarlas." #. (para) #: ../source/TortoiseGit_en.xml:7600 -msgid "For more information about properties in Subversion see the Special Properties." -msgstr "Puede encontrar más información sobre las propiedades en Subversion en Propiedades especiales." +msgid "For more information about properties in Git see the Special Properties." +msgstr "Puede encontrar más información sobre las propiedades en Git en Propiedades especiales." #. (title) #: ../source/TortoiseGit_en.xml:7607 @@ -6583,13 +6583,13 @@ msgstr "auto-props" #. (para) #: ../source/TortoiseGit_en.xml:7718 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." -msgstr "Puede configurar Subversion y TortoiseGit para que establezca propiedades automáticamente en ficheros y carpetas cuando se añaden al repositorio. Hay dos formas de hacerlo." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgstr "Puede configurar Git y TortoiseGit para que establezca propiedades automáticamente en ficheros y carpetas cuando se añaden al repositorio. Hay dos formas de hacerlo." #. (para) #: ../source/TortoiseGit_en.xml:7723 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." -msgstr "Puede editar el fichero de configuración de Subversion para habilitar esta característica en su cliente. La página General del diálogo de configuración de TortoiseGit tiene un botón de edición para llevarle allí directamente. El fichero de configuración es un fichero de texto simple que controla algunas de las funciones de Subversion. Necesita cambiar dos cosas: primero, en la sección encabezada por miscellany, descomente la línea enable-auto-props = yes. En segundo lugar, necesita editar la sección a continuación para definir qué propiedades quiere que se añadan a qué tipos de ficheros. Este método es una función estándar de Subversion y funciona con cualquier cliente de Subversion. Sin embargo, debe definirse en cada cliente de forma individual - no hay forma de propagar estas configuraciones desde el repositorio." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgstr "Puede editar el fichero de configuración de Git para habilitar esta característica en su cliente. La página General del diálogo de configuración de TortoiseGit tiene un botón de edición para llevarle allí directamente. El fichero de configuración es un fichero de texto simple que controla algunas de las funciones de Git. Necesita cambiar dos cosas: primero, en la sección encabezada por miscellany, descomente la línea enable-auto-props = yes. En segundo lugar, necesita editar la sección a continuación para definir qué propiedades quiere que se añadan a qué tipos de ficheros. Este método es una función estándar de Git y funciona con cualquier cliente de Git. Sin embargo, debe definirse en cada cliente de forma individual - no hay forma de propagar estas configuraciones desde el repositorio." #. (para) #: ../source/TortoiseGit_en.xml:7740 @@ -6613,8 +6613,8 @@ msgstr "Confirmar propiedades" #. (para) #: ../source/TortoiseGit_en.xml:7760 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." -msgstr "Las propiedades de Subversion están versionadas. Después de que cambie o añada una propiedad tiene que confirmar sus cambios." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." +msgstr "Las propiedades de Git están versionadas. Después de que cambie o añada una propiedad tiene que confirmar sus cambios." #. (title) #: ../source/TortoiseGit_en.xml:7766 @@ -6623,8 +6623,8 @@ msgstr "Conflictos en las propiedades" #. (para) #: ../source/TortoiseGit_en.xml:7767 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." -msgstr "Si hay un conflicto al confirmar los cambios, porque otro usuario ha cambiado la misma propiedad, Subversion genera un fichero .prej. Borre este fichero después de que haya resuelto del conflicto." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." +msgstr "Si hay un conflicto al confirmar los cambios, porque otro usuario ha cambiado la misma propiedad, Git genera un fichero .prej. Borre este fichero después de que haya resuelto del conflicto." #. (title) #: ../source/TortoiseGit_en.xml:7776 @@ -6663,8 +6663,8 @@ msgstr "tsvn:logtemplate se utiliza en proyectos que tienen r #. (para) #: ../source/TortoiseGit_en.xml:7832 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." -msgstr "Subversion le permite establecer autoprops (autopropiedades), que serán aplicadas a los ficheros recién añadidos o importados, basándose en la extensión del fichero. Esto necesita que todos los clientes hayan establecido las autoprops adecuadas en el fichero de configuración de Subversion. tsvn:autoprops puede establecerse en carpetas y éstas se fusionarán con las autoprops locales del usuario cuando se importen o añadan ficheros. El formato es el mismo que para las autopropiedades de Subversion, por ejemplo *.sh = svn:eol-style=native;svn:executable establece dos propiedades en los ficheros con extensión .sh." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgstr "Git le permite establecer autoprops (autopropiedades), que serán aplicadas a los ficheros recién añadidos o importados, basándose en la extensión del fichero. Esto necesita que todos los clientes hayan establecido las autoprops adecuadas en el fichero de configuración de Git. tsvn:autoprops puede establecerse en carpetas y éstas se fusionarán con las autoprops locales del usuario cuando se importen o añadan ficheros. El formato es el mismo que para las autopropiedades de Git, por ejemplo *.sh = svn:eol-style=native;svn:executable establece dos propiedades en los ficheros con extensión .sh." #. (para) #: ../source/TortoiseGit_en.xml:7845 @@ -6750,8 +6750,8 @@ msgstr "Cuando añada nuevas subcarpetas utilizando TortoiseGit, cualquier propi #. (para) #: ../source/TortoiseGit_en.xml:7965 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." -msgstr "Aunque las propiedades de proyecto de TortoiseGit son extremadamente útiles, sólo funcionan con TortoiseGit, y algunas sólo funcionarán en las versiones más recientes de TortoiseGit. Si la gente que trabaja en su proyecto utiliza un número de clientes de Subversion diferentes, o es posible que tengan versiones antiguas de TortoiseGit, puede que quiera utilizar ganchos de repositorio para forzar políticas de proyectos. Las propiedades de proyecto sólo ayudan a implementar una política, no pueden forzarlas." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgstr "Aunque las propiedades de proyecto de TortoiseGit son extremadamente útiles, sólo funcionan con TortoiseGit, y algunas sólo funcionarán en las versiones más recientes de TortoiseGit. Si la gente que trabaja en su proyecto utiliza un número de clientes de Git diferentes, o es posible que tengan versiones antiguas de TortoiseGit, puede que quiera utilizar ganchos de repositorio para forzar políticas de proyectos. Las propiedades de proyecto sólo ayudan a implementar una política, no pueden forzarlas." #. (title) #: ../source/TortoiseGit_en.xml:7978 @@ -6782,8 +6782,8 @@ msgstr "Otra característica de los sistemas de control de versiones es la posib #. (para) #: ../source/TortoiseGit_en.xml:8008 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." -msgstr "Subversion no tiene comandos especiales para hacer ramas o etiquetas, pero en cambio utiliza lo que se denomina copias baratas. Las copias baratas son similares a los vínculos duros de Unix, que significa que en vez de hacer una copia completa en el repositorio, se crea un vínculo interno, apuntando a una revisión y árbol específicos. Como resultado, las ramas y las etiquetas son muy rápidas de crear, y casi no conllevan espacio extra en el repositorio." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgstr "Git no tiene comandos especiales para hacer ramas o etiquetas, pero en cambio utiliza lo que se denomina copias baratas. Las copias baratas son similares a los vínculos duros de Unix, que significa que en vez de hacer una copia completa en el repositorio, se crea un vínculo interno, apuntando a una revisión y árbol específicos. Como resultado, las ramas y las etiquetas son muy rápidas de crear, y casi no conllevan espacio extra en el repositorio." #. (title) #: ../source/TortoiseGit_en.xml:8018 @@ -6929,8 +6929,8 @@ msgstr "Si modifica una copia de trabajo creada desde una rama y confirma, enton #. (para) #: ../source/TortoiseGit_en.xml:8195 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " -msgstr "Aunque Subversion por sí mismo no hace ninguna distinción entre etiquetas y ramas, la forma en la que normalmente se usan difiere un poco. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgstr "Aunque Git por sí mismo no hace ninguna distinción entre etiquetas y ramas, la forma en la que normalmente se usan difiere un poco. " #. (title) #: ../source/TortoiseGit_en.xml:8239 @@ -6955,8 +6955,8 @@ msgstr "Mientras que las ramas se utilizan para mantener líneas de desarrollo s #. (para) #: ../source/TortoiseGit_en.xml:8249 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." -msgstr "Es importante entender cómo funcionan las ramas y la fusión en Subversion antes de empezar a utilizarlos, porque puede convertirse en algo bastante complejo. Le recomendamos encarecidamente que lea el capítulo Creando ramas y fusionando en el libro de Subversion, que le proporcionará una descripción completa, y muchos ejemplos de cómo se utiliza." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." +msgstr "Es importante entender cómo funcionan las ramas y la fusión en Git antes de empezar a utilizarlos, porque puede convertirse en algo bastante complejo. Le recomendamos encarecidamente que lea el capítulo Creando ramas y fusionando en el libro de Git, que le proporcionará una descripción completa, y muchos ejemplos de cómo se utiliza." #. (para) #: ../source/TortoiseGit_en.xml:8259 @@ -6985,8 +6985,8 @@ msgstr "Este método cubre el caso en el que ha hecho una o más revisiones a un #. (para) #: ../source/TortoiseGit_en.xml:8292 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." -msgstr "Lo que le está pidiendo a Subversion que haga es: Calcula los cambios necesarios para ir [DESDE] la revisión 1 de la rama A [HASTA] la revisión 7 de la rama A, y aplica esos cambios en mi copia de trabajo (del tronco o de la rama B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgstr "Lo que le está pidiendo a Git que haga es: Calcula los cambios necesarios para ir [DESDE] la revisión 1 de la rama A [HASTA] la revisión 7 de la rama A, y aplica esos cambios en mi copia de trabajo (del tronco o de la rama B)." #. (term) #. (title) @@ -6997,13 +6997,13 @@ msgstr "Reintegrando una rama." #. (para) #: ../source/TortoiseGit_en.xml:8303 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." -msgstr "Este método cubre el caso cuando ha realizado una rama de funcionalidad como se discute en el libro de Subversion. Todos los cambios del tronco han sido portados a la rama de la funcionalidad, semana a semana, y ahora que la funcionalidad está completa desea fusionarla de nuevo en el tronco. Dado que ha mantenido la rama de la funcionalidad sincronizada con el tronco, las últimas versiones de la rama y del tronco serán absolutamente iguales excepto por sus cambios en la rama." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgstr "Este método cubre el caso cuando ha realizado una rama de funcionalidad como se discute en el libro de Git. Todos los cambios del tronco han sido portados a la rama de la funcionalidad, semana a semana, y ahora que la funcionalidad está completa desea fusionarla de nuevo en el tronco. Dado que ha mantenido la rama de la funcionalidad sincronizada con el tronco, las últimas versiones de la rama y del tronco serán absolutamente iguales excepto por sus cambios en la rama." #. (para) #: ../source/TortoiseGit_en.xml:8312 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." -msgstr "Este es un caso especial de la fusión de árboles describa más abajo, y necesita sólo la URL desde la que fusionar (normalmente) su rama de desarrollo. Utiliza las características de registro de fusiones de Subversion para calcular el rango de revisiones correcto que se debe utilizar, y realiza comprobaciones adicionales para asegurarse de que la rama ha sido completamente actualizada con los cambios del tronco. Esto le asegura que no va a deshacer accidentalmente el trabajo que otros han confirmado en el tronco desde sus últimos cambios sincronizados." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgstr "Este es un caso especial de la fusión de árboles describa más abajo, y necesita sólo la URL desde la que fusionar (normalmente) su rama de desarrollo. Utiliza las características de registro de fusiones de Git para calcular el rango de revisiones correcto que se debe utilizar, y realiza comprobaciones adicionales para asegurarse de que la rama ha sido completamente actualizada con los cambios del tronco. Esto le asegura que no va a deshacer accidentalmente el trabajo que otros han confirmado en el tronco desde sus últimos cambios sincronizados." #. (para) #: ../source/TortoiseGit_en.xml:8322 @@ -7017,13 +7017,13 @@ msgstr "Fusionando dos árboles diferentes." #. (para) #: ../source/TortoiseGit_en.xml:8332 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." -msgstr "Este es un caso más general del método de reintegración. Lo que le está pidiendo a Subversion que haga es: Calcula los cambios necesarios para ir [DESDE] la revisión HEAD del tronco [HASTA] la revisión HEAD de la rama, y aplica esos cambios a mi copia de trabajo (del tronco). El resultado neto es que el tronco ahora es exactamente igual a la rama." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgstr "Este es un caso más general del método de reintegración. Lo que le está pidiendo a Git que haga es: Calcula los cambios necesarios para ir [DESDE] la revisión HEAD del tronco [HASTA] la revisión HEAD de la rama, y aplica esos cambios a mi copia de trabajo (del tronco). El resultado neto es que el tronco ahora es exactamente igual a la rama." #. (para) #: ../source/TortoiseGit_en.xml:8340 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." -msgstr "Si su servidor/repositorio no soporta el registro de fusiones, entonces esta es la única forma de fusionar una rama de nuevo al tronco (trunk). Otro caso de uso ocurre cuando utiliza ramas de vendedor y necesita fusionar los cambios después de incorporar una nueva versión de ese código en el tronco. Para más información lea el capítulo sobre ramas de vendedor en el Libro de Subversion." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." +msgstr "Si su servidor/repositorio no soporta el registro de fusiones, entonces esta es la única forma de fusionar una rama de nuevo al tronco (trunk). Otro caso de uso ocurre cuando utiliza ramas de vendedor y necesita fusionar los cambios después de incorporar una nueva versión de ese código en el tronco. Para más información lea el capítulo sobre ramas de vendedor en el Libro de Git." #. (title) #: ../source/TortoiseGit_en.xml:8355 @@ -7067,8 +7067,8 @@ msgstr "Si ya ha fusionado algunos cambios desde esta rama, esperemos que haya a #. (para) #: ../source/TortoiseGit_en.xml:8411 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." -msgstr "Si está utilizando las características de registro de fusiones de Subversion, no necesita recordar qué revisiones ya han sido fusionadas - Subversion lo apuntará por usted. Si deja el rango de revisiones en blanco, se incluirán todas las revisiones que no hayan sido aún fusionadas. Lea para saber más." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgstr "Si está utilizando las características de registro de fusiones de Git, no necesita recordar qué revisiones ya han sido fusionadas - Git lo apuntará por usted. Si deja el rango de revisiones en blanco, se incluirán todas las revisiones que no hayan sido aún fusionadas. Lea para saber más." #. (para) #: ../source/TortoiseGit_en.xml:8419 @@ -7162,8 +7162,8 @@ msgstr "Puede especificar la profundidad de la fusión, es decir, cuántos nivel #. (para) #: ../source/TortoiseGit_en.xml:8521 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" -msgstr "La mayoría del tiempo desea que la fustión tenga en cuenta el historial de un fichero, para que se fusionen los cambios relativos a un ancestro en común. A veces puede necesitar fusionar ficheros que quizás estén relacionados, pero no en su repositorio. Por ejemplo, puede haber importado las versiones 1 y 2 de una biblioteca de terceros en dos directorios separados. Aunque están relacionados de forma lógica, Subversion no tiene conocimiento de ello porque sólo ve los ficheros que ha importado. Si intenta fusionar las diferencias entre estos dos ficheros vería un borrado completo seguido de un adición completa. Para hacer que Subversion sólo utilice las diferencias basadas-en-ruta en vez de diferencias basadas-en-historial, seleccione la casilla Ignorar ancestros. Puede leer más sobre este tema en el libro de Subversion; Teniendo en cuenta o ignorando los ancestros" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" +msgstr "La mayoría del tiempo desea que la fustión tenga en cuenta el historial de un fichero, para que se fusionen los cambios relativos a un ancestro en común. A veces puede necesitar fusionar ficheros que quizás estén relacionados, pero no en su repositorio. Por ejemplo, puede haber importado las versiones 1 y 2 de una biblioteca de terceros en dos directorios separados. Aunque están relacionados de forma lógica, Git no tiene conocimiento de ello porque sólo ve los ficheros que ha importado. Si intenta fusionar las diferencias entre estos dos ficheros vería un borrado completo seguido de un adición completa. Para hacer que Git sólo utilice las diferencias basadas-en-ruta en vez de diferencias basadas-en-historial, seleccione la casilla Ignorar ancestros. Puede leer más sobre este tema en el libro de Git; Teniendo en cuenta o ignorando los ancestros" #. (para) #: ../source/TortoiseGit_en.xml:8538 @@ -7197,12 +7197,12 @@ msgstr "La fusión ya ha concluído. Es una buena idea observar la fusión y com #. (para) #: ../source/TortoiseGit_en.xml:8582 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." -msgstr "Los clientes y servidores de Subversion anteriores a la versión 1.5 no almacenan la información de fusión, y las revisiones fusionadas deben ser registradas de forma manual. Cuando haya comprobado los cambios y vaya a confirmar esta revisión, su mensaje de registro de confirmación debería incluir siempre los números de revisión que han sido portados en la fusión. Si desea aplicar otra fusión más tarde, necesitará saber lo que ya ha fusionado, porque no querrá portar un cambio más de una vez. Puede encontrar más información sobre esto en Las mejores prácticas para fusionar en el libro de Subversion." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." +msgstr "Los clientes y servidores de Git anteriores a la versión 1.5 no almacenan la información de fusión, y las revisiones fusionadas deben ser registradas de forma manual. Cuando haya comprobado los cambios y vaya a confirmar esta revisión, su mensaje de registro de confirmación debería incluir siempre los números de revisión que han sido portados en la fusión. Si desea aplicar otra fusión más tarde, necesitará saber lo que ya ha fusionado, porque no querrá portar un cambio más de una vez. Puede encontrar más información sobre esto en Las mejores prácticas para fusionar en el libro de Git." #. (para) #: ../source/TortoiseGit_en.xml:8596 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "Si su servidor y todos los clientes están ejecutando Subverison 1.5 o superior, las facilidades de registro de fusiones apuntarán las revisiones fusionadas y evitarán que una revisión se fusione más de una vez. Esto le facilita mucho la vida ya que puede simplemente fusionar el rango entero de revisiones cada vez y saber qué sólo las nuevas revisiones serán realmente fusionadas." #. (para) @@ -7217,8 +7217,8 @@ msgstr "Si acaba de fusionar una rama de característica en el tronco, el tronco #. (para) #: ../source/TortoiseGit_en.xml:8618 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." -msgstr "Subversion no puede fusionar un fichero con una carpeta, y viceversa - sólo carpetas con carpetas y ficheros con ficheros. Si pulsa en un fichero y abre el diálogo de fusionar, entonces deberá darle una ruta a un fichero en ese diálogo. Si selecciona una carpeta y llama al diálogo, debe especificar una URL de una carpeta para la fusión." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgstr "Git no puede fusionar un fichero con una carpeta, y viceversa - sólo carpetas con carpetas y ficheros con ficheros. Si pulsa en un fichero y abre el diálogo de fusionar, entonces deberá darle una ruta a un fichero en ese diálogo. Si selecciona una carpeta y llama al diálogo, debe especificar una URL de una carpeta para la fusión." #. (title) #: ../source/TortoiseGit_en.xml:8628 @@ -7252,8 +7252,8 @@ msgstr "Puede marcar revisiones como no fusionar si las inc #. (para) #: ../source/TortoiseGit_en.xml:8632 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " -msgstr "Subversion 1.5 introdujo facilidades para el registro de fusiones.. Cuando fusiona cambios de un árbol en otro, los números de revisión fusionados se almacenan, y esta información se puede utilizar para diferentes propósitos. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgstr "Git 1.5 introdujo facilidades para el registro de fusiones.. Cuando fusiona cambios de un árbol en otro, los números de revisión fusionados se almacenan, y esta información se puede utilizar para diferentes propósitos. " #. (para) #: ../source/TortoiseGit_en.xml:8662 @@ -7262,8 +7262,8 @@ msgstr "La información de registro de fusiones se almacena en la propiedad Merge tracking documentation." -msgstr "Averigue más sobre el registro de fusión desde la Documentación de registro de fusión de Subversion." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." +msgstr "Averigue más sobre el registro de fusión desde la Documentación de registro de fusión de Git." #. (title) #: ../source/TortoiseGit_en.xml:8680 @@ -7372,18 +7372,18 @@ msgstr "Su compañía ha utilizado en el pasado un sistema de control de version #. (para) #: ../source/TortoiseGit_en.xml:8793 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " -msgstr "Subversion generalmente trabaja mejor sin bloqueos, utilizando los métodos Copiar-Modificar-Fusionar que se describieron anteriormente en el . Sin embargo, hay algunas pocas situaciones en las que puede querer implementar alguna forma de política de bloqueo. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgstr "Git generalmente trabaja mejor sin bloqueos, utilizando los métodos Copiar-Modificar-Fusionar que se describieron anteriormente en el . Sin embargo, hay algunas pocas situaciones en las que puede querer implementar alguna forma de política de bloqueo. " #. (para) #: ../source/TortoiseGit_en.xml:8817 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." -msgstr "Primero necesita asegurarse de que su servidor de Subversion está actualizado al menos a la versión 1.2. Las versiones anteriores no tienen ningún soporte de bloqueos. Si está usando el acceso file://, sólo necesitará actualizar sus clientes, por supuesto." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgstr "Primero necesita asegurarse de que su servidor de Git está actualizado al menos a la versión 1.2. Las versiones anteriores no tienen ningún soporte de bloqueos. Si está usando el acceso file://, sólo necesitará actualizar sus clientes, por supuesto." #. (title) #: ../source/TortoiseGit_en.xml:8824 -msgid "How Locking Works in Subversion" -msgstr "Cómo trabaja el bloqueo en Subversion" +msgid "How Locking Works in Git" +msgstr "Cómo trabaja el bloqueo en Git" #. (para) #: ../source/TortoiseGit_en.xml:8825 @@ -7397,8 +7397,8 @@ msgstr "Si Obtiene un Bloqueo en un fichero, entonces só #. (para) #: ../source/TortoiseGit_en.xml:8838 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." -msgstr "Sin embargo, los demás usuarios no necesariamente saben que usted ha obtenido un bloqueo. A menos que ellos comprueben el estado de bloqueo regularmente, la primera vez que sabrán sobre él es cuando sus confirmaciones fallen, lo que muchas veces no es muy útil. Para hacer más fácil el manejo de bloqueos, hay una nueva propiedad de Subversion svn:needs-lock. Cuando se establece esta propiedad (a cualquier valor) en un fichero, siempre que el fichero se obtiene o actualiza, la copia local se deja como sólo-lectura a menos que la copia de trabajo tenga un bloqueo para ese fichero. Esto actúa como una advertencia de que no debería modificar el fichero a menos que obtenga un bloqueo. Los ficheros que están versionados y marcados como sólo-lectura se marcan con un icono de sobreimpresión especial en TortoiseGit para indicar que necesita obtener un bloqueo antes de editar." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgstr "Sin embargo, los demás usuarios no necesariamente saben que usted ha obtenido un bloqueo. A menos que ellos comprueben el estado de bloqueo regularmente, la primera vez que sabrán sobre él es cuando sus confirmaciones fallen, lo que muchas veces no es muy útil. Para hacer más fácil el manejo de bloqueos, hay una nueva propiedad de Git svn:needs-lock. Cuando se establece esta propiedad (a cualquier valor) en un fichero, siempre que el fichero se obtiene o actualiza, la copia local se deja como sólo-lectura a menos que la copia de trabajo tenga un bloqueo para ese fichero. Esto actúa como una advertencia de que no debería modificar el fichero a menos que obtenga un bloqueo. Los ficheros que están versionados y marcados como sólo-lectura se marcan con un icono de sobreimpresión especial en TortoiseGit para indicar que necesita obtener un bloqueo antes de editar." #. (para) #: ../source/TortoiseGit_en.xml:8854 @@ -7407,8 +7407,8 @@ msgstr "Los bloqueos se graban con el lugar de la copia local y también con el #. (para) #: ../source/TortoiseGit_en.xml:8860 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." -msgstr "Si uno de sus compañeros de trabajo obtiene un bloqueo y luego se va de vacaciones sin quitarlo, ¿qué hace? Subversion proporciona un método para forcar bloqueos. Quitar un bloqueo que tiene otra persona se define como Romper el bloqueo, y obtener forzosamente un bloqueo que tiene otro se define como Robar el bloqueo. Naturlamente estas no son cosas que hacer a la ligera si desea continuar siendo amigo de sus compañeros de trabajo." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgstr "Si uno de sus compañeros de trabajo obtiene un bloqueo y luego se va de vacaciones sin quitarlo, ¿qué hace? Git proporciona un método para forcar bloqueos. Quitar un bloqueo que tiene otra persona se define como Romper el bloqueo, y obtener forzosamente un bloqueo que tiene otro se define como Robar el bloqueo. Naturlamente estas no son cosas que hacer a la ligera si desea continuar siendo amigo de sus compañeros de trabajo." #. (para) #: ../source/TortoiseGit_en.xml:8870 @@ -7477,8 +7477,8 @@ msgstr "Evite romper y robar bloqueos" #. (para) #: ../source/TortoiseGit_en.xml:8961 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." -msgstr "Si ha roto o robado el bloqueo de otro sin decírselo, puede causar una pérdida potencial de trabajo. Si está trabajando con tipos de ficheros no fusionables y roba el bloqueo de otro, una vez que usted quite el bloqueo ellos son libres de confirmar sus cambios y sobreescribir los suyos. Subversion no pierde datos, pero ha perdido la protección para trabajo en equipo que el bloqueo le proporcionaba." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." +msgstr "Si ha roto o robado el bloqueo de otro sin decírselo, puede causar una pérdida potencial de trabajo. Si está trabajando con tipos de ficheros no fusionables y roba el bloqueo de otro, una vez que usted quite el bloqueo ellos son libres de confirmar sus cambios y sobreescribir los suyos. Git no pierde datos, pero ha perdido la protección para trabajo en equipo que el bloqueo le proporcionaba." #. (title) #: ../source/TortoiseGit_en.xml:8973 @@ -7492,8 +7492,8 @@ msgstr "Como se menciona arriba, la manera más efectiva de utilizar los bloqueo #. (para) #: ../source/TortoiseGit_en.xml:8984 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." -msgstr "Si opera una política donde todos los ficheros han de ser bloqueados, puede que encuentre más fácil utilizar la característica de Subversion auto-props para establecer la propiedad automáticamente cada vez que añada nuevos ficheros. Para más información, lea ." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgstr "Si opera una política donde todos los ficheros han de ser bloqueados, puede que encuentre más fácil utilizar la característica de Git auto-props para establecer la propiedad automáticamente cada vez que añada nuevos ficheros. Para más información, lea ." #. (title) #: ../source/TortoiseGit_en.xml:8993 @@ -7502,8 +7502,8 @@ msgstr "Los scripts ganchos de bloqueo" #. (para) #: ../source/TortoiseGit_en.xml:8994 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." -msgstr "Cuando crea un nuevo respositorio con Subversion 1.2 o superior, se crean cuatro plantillas en el directorio hooks del repositorio. Éstos se llaman antes y después de obtener un bloqueo, y antes y después de quitar un bloqueo." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgstr "Cuando crea un nuevo respositorio con Git 1.2 o superior, se crean cuatro plantillas en el directorio hooks del repositorio. Éstos se llaman antes y después de obtener un bloqueo, y antes y después de quitar un bloqueo." #. (para) #: ../source/TortoiseGit_en.xml:9000 @@ -8169,8 +8169,8 @@ msgstr "También puede fusionar cambios en la(s) revision(es) seleccionada(s) en #. (para) #: ../source/TortoiseGit_en.xml:9840 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." -msgstr "Dado que Subversion no puede proporcionar toda la información necesaria, se necesita una cierta cantidad de interpretación, que a veces puede dar resultados estraños. En cualquier caso, la salida para el tronco generalmente da resultados útiles." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgstr "Dado que Git no puede proporcionar toda la información necesaria, se necesita una cierta cantidad de interpretación, que a veces puede dar resultados estraños. En cualquier caso, la salida para el tronco generalmente da resultados útiles." #. (para) #: ../source/TortoiseGit_en.xml:9850 @@ -8184,8 +8184,8 @@ msgstr "Si está utilizando la caché de registros y cree que el contenido del m #. (title) #: ../source/TortoiseGit_en.xml:9869 -msgid "Exporting a Subversion Working Copy" -msgstr "Exportando una copia de trabajo de Subversion" +msgid "Exporting a Git Working Copy" +msgstr "Exportando una copia de trabajo de Git" #. (primary) #: ../source/TortoiseGit_en.xml:9871 @@ -8239,8 +8239,8 @@ msgstr "Exportando ficheros sueltos" #. (para) #: ../source/TortoiseGit_en.xml:9944 -msgid "The export dialog does not allow exporting single files, even though Subversion can." -msgstr "El diálogo de exportar no permite exporar ficheros sueltos, aunque Subversion puede hacerlo." +msgid "The export dialog does not allow exporting single files, even though Git can." +msgstr "El diálogo de exportar no permite exporar ficheros sueltos, aunque Git puede hacerlo." #. (para) #: ../source/TortoiseGit_en.xml:9948 @@ -8331,8 +8331,8 @@ msgstr "Esta es una operación que se utiliza realmente pocotsvn: sólo #. (para) #: ../source/TortoiseGit_en.xml:10383 -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification." -msgstr "La integración del seguimiento de incidencias no se restringe a TortoiseGit; puede utilizarse con cualquier cliente de Subversion. Para más información, lea toda la Especificación de integración con los seguimientos de incidencias." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification." +msgstr "La integración del seguimiento de incidencias no se restringe a TortoiseGit; puede utilizarse con cualquier cliente de Git. Para más información, lea toda la Especificación de integración con los seguimientos de incidencias." #. (title) #: ../source/TortoiseGit_en.xml:10392 @@ -8603,8 +8603,8 @@ msgstr "ViewCS" #. (para) #: ../source/TortoiseGit_en.xml:10441 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." -msgstr "Hay varios visores de repositorios basados en web disponibles para utilizarlos con Subversion como ViewVC y WebSVN. TortoiseGit dispone de medios para enlazarse con estos visores." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgstr "Hay varios visores de repositorios basados en web disponibles para utilizarlos con Git como ViewVC y WebSVN. TortoiseGit dispone de medios para enlazarse con estos visores." #. (para) #: ../source/TortoiseGit_en.xml:10453 @@ -8658,8 +8658,8 @@ msgstr "El diálogo de Configuración, página General" #. (para) #: ../source/TortoiseGit_en.xml:10554 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." -msgstr " Este diálogo le permite especificar su idioma preferido, y las configuraciones específicas de Subversion." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." +msgstr " Este diálogo le permite especificar su idioma preferido, y las configuraciones específicas de Git." #. (term) #: ../source/TortoiseGit_en.xml:10564 @@ -8728,13 +8728,13 @@ msgstr "Los patrones globales de ignorar se utilizan para evitar que aparezcan f #. (para) #: ../source/TortoiseGit_en.xml:10636 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." -msgstr "Tenga en cuenta que los patrones de ignorar que especifique aquí también afectarán a otros clientes de Subversion que se ejecuten en su PC, incluyendo el cliente de línea de comandos." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." +msgstr "Tenga en cuenta que los patrones de ignorar que especifique aquí también afectarán a otros clientes de Git que se ejecuten en su PC, incluyendo el cliente de línea de comandos." #. (para) #: ../source/TortoiseGit_en.xml:10642 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." -msgstr "Si utiliza el fichero de configuración de Subversion para establecer un patrón global-ignores, prevalecerá sobre las configuraciones que haga aquí. El fichero de configuración de Subversion se accede utilizando Editar como se describe a continuación." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." +msgstr "Si utiliza el fichero de configuración de Git para establecer un patrón global-ignores, prevalecerá sobre las configuraciones que haga aquí. El fichero de configuración de Git se accede utilizando Editar como se describe a continuación." #. (para) #: ../source/TortoiseGit_en.xml:10650 @@ -8753,13 +8753,13 @@ msgstr "Esta opción le indica a TortoiseGit que establezca las fechas de los fi #. (term) #: ../source/TortoiseGit_en.xml:10678 -msgid "Subversion configuration file" -msgstr "Fichero de configuración de Subversion" +msgid "Git configuration file" +msgstr "Fichero de configuración de Git" #. (para) #: ../source/TortoiseGit_en.xml:10680 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." -msgstr "Utilice Editar para editar el fichero de configuración de Subversion directamente. Algunas opciones no pueden ser modificadas directamente por TortoiseGit, y en cambio necesitan establecerse aquí. Para más información sobre el fichero config de Subversion, lea Área de configuración en tiempo de ejecución. La sección sobre Configuración automática de propiedades es especialmente interesante, y eso es lo que se configura aquí. Tenga en cuenta que Subversion puede leer la información de configuración desde varios lugares, y necesita saber cuál tiene prioridad. Para obtener más información sobre ésto, lea Configuración y el registro de Windows." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgstr "Utilice Editar para editar el fichero de configuración de Git directamente. Algunas opciones no pueden ser modificadas directamente por TortoiseGit, y en cambio necesitan establecerse aquí. Para más información sobre el fichero config de Git, lea Área de configuración en tiempo de ejecución. La sección sobre Configuración automática de propiedades es especialmente interesante, y eso es lo que se configura aquí. Tenga en cuenta que Git puede leer la información de configuración desde varios lugares, y necesita saber cuál tiene prioridad. Para obtener más información sobre ésto, lea Configuración y el registro de Windows." #. (term) #: ../source/TortoiseGit_en.xml:10705 @@ -8768,13 +8768,13 @@ msgstr "Utiliza directorios _svn en vez de .svn.svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." -msgstr "VS.NET cuando se utiliza con proyectos web no puede manejar las carpetas .svn que Subversion utiliza para almacenar su información interna. Esto no es un error de Subversion. El error está en VS.NET y las extensiones de Frontpage que utiliza. Lea para averiguar más sobre este problema." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgstr "VS.NET cuando se utiliza con proyectos web no puede manejar las carpetas .svn que Git utiliza para almacenar su información interna. Esto no es un error de Git. El error está en VS.NET y las extensiones de Frontpage que utiliza. Lea para averiguar más sobre este problema." #. (para) #: ../source/TortoiseGit_en.xml:10714 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." -msgstr "Si desea cambiar el comportamiento de Subversion y TortoiseGit, puede utilizar esta casilla para establecer la variable de entorno que lo controla." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgstr "Si desea cambiar el comportamiento de Git y TortoiseGit, puede utilizar esta casilla para establecer la variable de entorno que lo controla." #. (para) #: ../source/TortoiseGit_en.xml:10719 @@ -8873,8 +8873,8 @@ msgstr "Auto-cerrar si no hay conflictos relaja el criterio #. (para) #: ../source/TortoiseGit_en.xml:10837 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." -msgstr "Auto-cerrar si no hay errores siempre cierra el diálogo, incluso si hay conflictos. La única condición que deja el diálogo abierto es una condición de error, que ocurre cuando Subversion no puede terminar una tarea. Por ejemplo, una actualización falla si el servidor es inaccesible, o una confirmación falla cuando la copia de trabajo no está actualizada." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgstr "Auto-cerrar si no hay errores siempre cierra el diálogo, incluso si hay conflictos. La única condición que deja el diálogo abierto es una condición de error, que ocurre cuando Git no puede terminar una tarea. Por ejemplo, una actualización falla si el servidor es inaccesible, o una confirmación falla cuando la copia de trabajo no está actualizada." #. (term) #: ../source/TortoiseGit_en.xml:10849 @@ -9243,13 +9243,13 @@ msgstr "Excluir Rutas se usa para decirle a TortoiseGit en #. (para) #: ../source/TortoiseGit_en.xml:11251 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "f:\\desarrollo\\SVN\\Subversion desabilitará las sobreimpresiones sólo en esa ruta concreta. Todavía podrá ver las sobreimpresiones en todos los ficheros y carpetas dentro de esa carpeta." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "f:\\desarrollo\\SVN\\Git desabilitará las sobreimpresiones sólo en esa ruta concreta. Todavía podrá ver las sobreimpresiones en todos los ficheros y carpetas dentro de esa carpeta." #. (para) #: ../source/TortoiseGit_en.xml:11256 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "f:\\desarrollo\\SVN\\Subversion* deshabilitará las sobreimpresiones en todos los ficheros y carpetas cuya ruta empiece por f:\\desarrollo\\SVN\\Subversion. Esto significa que no verá sobreimpresiones para ningún fichero y carpetas debajo de esa ruta." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "f:\\desarrollo\\SVN\\Git* deshabilitará las sobreimpresiones en todos los ficheros y carpetas cuya ruta empiece por f:\\desarrollo\\SVN\\Git. Esto significa que no verá sobreimpresiones para ningún fichero y carpetas debajo de esa ruta." #. (para) #: ../source/TortoiseGit_en.xml:11263 @@ -9351,8 +9351,8 @@ msgstr " Aquí puede configurar su servidor proxy, si necesita u #. (para) #: ../source/TortoiseGit_en.xml:11358 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." -msgstr "Si necesita preparar configuraciones de proxy por cada repositorio, necesitará utilizar el fichero servers de Subversion para configurarlo. Utilice Editar para llegar allí directamente. Consulte Área de configuración en tiempo de ejecución para ver los detalles sobre cómo utilizar este fichero." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgstr "Si necesita preparar configuraciones de proxy por cada repositorio, necesitará utilizar el fichero servers de Git para configurarlo. Utilice Editar para llegar allí directamente. Consulte Área de configuración en tiempo de ejecución para ver los detalles sobre cómo utilizar este fichero." #. (para) #: ../source/TortoiseGit_en.xml:11368 @@ -9381,8 +9381,8 @@ msgstr "Para evitar ser preguntado por una contraseña repetidamente, puede cons #. (para) #: ../source/TortoiseGit_en.xml:11403 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." -msgstr "Finalmente, configurar SSH en el servidor y los clientes en un proceso no-trivial que está fuera del alcance de este fichero de ayuda. Sin embargo, puede encontrar una guía en el FAQ de TortoiseGit mostrado como Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." +msgstr "Finalmente, configurar SSH en el servidor y los clientes en un proceso no-trivial que está fuera del alcance de este fichero de ayuda. Sin embargo, puede encontrar una guía en el FAQ de TortoiseGit mostrado como Git/TortoiseGit SSH How-To." #. (title) #: ../source/TortoiseGit_en.xml:11413 @@ -9477,8 +9477,8 @@ msgstr "Si utiliza la propiedad svn:keywords para expandir pa #. (para) #: ../source/TortoiseGit_en.xml:11519 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." -msgstr "También puede especificar una herramienta distinta de diferencias para utilizarla en las propiedades de Subversion. Dado que estas tienden a ser cadenas cortas de texto simple, puede que desee utilizar un visor más compacto." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgstr "También puede especificar una herramienta distinta de diferencias para utilizarla en las propiedades de Git. Dado que estas tienden a ser cadenas cortas de texto simple, puede que desee utilizar un visor más compacto." #. (para) #: ../source/TortoiseGit_en.xml:11524 @@ -9654,8 +9654,8 @@ msgstr "Datos de autentificación" #. (para) #: ../source/TortoiseGit_en.xml:11752 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" -msgstr "Cuando se autentifica con un servidor de Subversion, el usuario y la contraseña se cachean localmente para que no tenga que seguir introduciéndolos. Puede querer limpiar esto por razones de seguridad, o porque quiere acceder al repositorio bajo un nombre de usuario diferente ... ¿sabe John que está utilizando su PC?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgstr "Cuando se autentifica con un servidor de Git, el usuario y la contraseña se cachean localmente para que no tenga que seguir introduciéndolos. Puede querer limpiar esto por razones de seguridad, o porque quiere acceder al repositorio bajo un nombre de usuario diferente ... ¿sabe John que está utilizando su PC?" #. (para) #: ../source/TortoiseGit_en.xml:11759 @@ -9894,8 +9894,8 @@ msgstr "El diálogo Configuración, página de scripts gancho" #. (para) #: ../source/TortoiseGit_en.xml:11993 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." -msgstr " Este diálogo le permite establecer scripts gancho que se ejecutarán automáticamente cuando se realicen ciertas acciones de Subversion. Al contrario que los scripts gancho explicados en , estos scripts se ejecutan localmente en el cliente." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgstr " Este diálogo le permite establecer scripts gancho que se ejecutarán automáticamente cuando se realicen ciertas acciones de Git. Al contrario que los scripts gancho explicados en , estos scripts se ejecutan localmente en el cliente." #. (para) #: ../source/TortoiseGit_en.xml:12003 @@ -9974,8 +9974,8 @@ msgstr "Pre-actualización" #. (para) #: ../source/TortoiseGit_en.xml:12064 -msgid "Called before the actual Subversion update begins." -msgstr "Llamado antes de que comience la actualización de Subversion." +msgid "Called before the actual Git update begins." +msgstr "Llamado antes de que comience la actualización de Git." #. (term) #. (term) @@ -10081,8 +10081,8 @@ msgstr "El significado de cada una de estos parámetros se describe aquí: Wait for the script to finish." -msgstr "Si quiere que la operación de Subversion espere a que el gancho termine, marque Esperar a que el script termine." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." +msgstr "Si quiere que la operación de Git espere a que el gancho termine, marque Esperar a que el script termine." #. (para) #: ../source/TortoiseGit_en.xml:12240 @@ -10171,8 +10171,8 @@ msgstr "Hay algunas configuraciones poco utilizadas que están disponibles únic #. (para) #: ../source/TortoiseGit_en.xml:12329 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." -msgstr "Puede especificar un lugar diferente para el fichero de configuración de Subversion utilizando la clave del registro HKCU\\Software\\TortoiseGit\\ConfigDir. Esto afectará a todas las operaciones de TortoiseGit." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgstr "Puede especificar un lugar diferente para el fichero de configuración de Git utilizando la clave del registro HKCU\\Software\\TortoiseGit\\ConfigDir. Esto afectará a todas las operaciones de TortoiseGit." #. (term) #: ../source/TortoiseGit_en.xml:12338 @@ -10226,8 +10226,8 @@ msgstr "TortoiseGit le permite asignar visores de diferencias externos. La mayor #. (title) #: ../source/TortoiseGit_en.xml:12405 -msgid "Subversion Working Folders" -msgstr "Carpetas de trabajo de Subversion" +msgid "Git Working Folders" +msgstr "Carpetas de trabajo de Git" #. (primary) #: ../source/TortoiseGit_en.xml:12407 @@ -10241,8 +10241,8 @@ msgstr "carpeta _svn" #. (para) #: ../source/TortoiseGit_en.xml:12412 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." -msgstr "VS.NET 2003, cuando se utilizan proyectos web, es incapaz de manejar las carpetas .svn que Subversion emplea para almacenar su información interna. Esto no es un error de Subversion. El error está en VS.NET 2003 y las extensiones de Frontpage que utiliza." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgstr "VS.NET 2003, cuando se utilizan proyectos web, es incapaz de manejar las carpetas .svn que Git emplea para almacenar su información interna. Esto no es un error de Git. El error está en VS.NET 2003 y las extensiones de Frontpage que utiliza." #. (para) #: ../source/TortoiseGit_en.xml:12419 @@ -10251,8 +10251,8 @@ msgstr "Tenga en cuenta que el bug está solucionado en VS2005 y versiones poste #. (para) #: ../source/TortoiseGit_en.xml:12423 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." -msgstr "Desde la versión 1.3.0 de Subversion y TortoiseGit, puede establecer la variable de entorno SVN_ASP_DOT_NET_HACK. Si se establece esa variable, Subversion utilizará carpetas _svn en vez de carpetas .svn. Debe reiniciar el shell para que esa variable de entorno tenga efecto. Normalmente, eso significa reiniciar su PC. Para hacerlo más sencillo, ahora puede hacer esto desde la página de configuración general utilizando una simple casilla - lea ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgstr "Desde la versión 1.3.0 de Git y TortoiseGit, puede establecer la variable de entorno SVN_ASP_DOT_NET_HACK. Si se establece esa variable, Git utilizará carpetas _svn en vez de carpetas .svn. Debe reiniciar el shell para que esa variable de entorno tenga efecto. Normalmente, eso significa reiniciar su PC. Para hacerlo más sencillo, ahora puede hacer esto desde la página de configuración general utilizando una simple casilla - lea ." #. (para) #: ../source/TortoiseGit_en.xml:12433 @@ -10306,7 +10306,7 @@ msgstr "número de versión en los ficheros" #. (para) #: ../source/TortoiseGit_en.xml:12484 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." msgstr "SubWCRev es un programa de consola para Windows que puede utilizarse para leer el estado de una copia de trabajo local y opcionalmente realizar sustituciones de palabras clave en un fichero plantilla. A menudo se utiliza como parte del proceso de compilación como una forma de incorporar información de la copia de trabajo en el objeto que está construyendo. Típicamente, se puede utilizar para incluir el número de revisión en un diálogo Acerca de." #. (title) @@ -10316,8 +10316,8 @@ msgstr "La línea de comandos de SubWCRev" #. (para) #: ../source/TortoiseGit_en.xml:12499 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." -msgstr "SubWCRev lee el estado de Subversion de todos los ficheros en una copia de trabajo, excluyendo los externos por defecto. Apunta el número de revisión de confirmación más alto que encuentra, y la fecha de esa confirmación. También apunta si hay modificaciones locales en la copia de trabajo, o revisiones de actualización mezcladas. El número de revisión, el rango de revisiones de actualización y el estado de las modificaciones se muestra por la salida estandar stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgstr "SubWCRev lee el estado de Git de todos los ficheros en una copia de trabajo, excluyendo los externos por defecto. Apunta el número de revisión de confirmación más alto que encuentra, y la fecha de esa confirmación. También apunta si hay modificaciones locales en la copia de trabajo, o revisiones de actualización mezcladas. El número de revisión, el rango de revisiones de actualización y el estado de las modificaciones se muestra por la salida estandar stdout." #. (para) #: ../source/TortoiseGit_en.xml:12507 @@ -10790,8 +10790,8 @@ msgstr "Se reemplaza con la URL del repositorio de la copia de trabajo usada en #. (para) #: ../source/TortoiseGit_en.xml:12823 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " -msgstr "Si necesita acceder a la información de las revisiones de Subversion desde otros programas, puede utilizar el interfaz COM de SubWCRev. El objeto a crear es SubWCRev.object, y se soportan los siguientes métodos: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgstr "Si necesita acceder a la información de las revisiones de Git desde otros programas, puede utilizar el interfaz COM de SubWCRev. El objeto a crear es SubWCRev.object, y se soportan los siguientes métodos: " #. (programlisting) #: ../source/TortoiseGit_en.xml:12902 @@ -10932,8 +10932,8 @@ msgstr "FAQ" #. (para) #: ../source/TortoiseGit_en.xml:12952 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "Dado que el desarrollo de TortoiseGit es continuo, a veces es complicado mantener la documentación completamente al día. Mantenemos un FAQ online que contiene una selección de las preguntas más frecuentes que recibimos en las listas de correo de TortoiseGit dev@TortoiseGit.tigris.org y users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "Dado que el desarrollo de TortoiseGit es continuo, a veces es complicado mantener la documentación completamente al día. Mantenemos un FAQ online que contiene una selección de las preguntas más frecuentes que recibimos en las listas de correo de TortoiseGit tortoisegit-dev@googlegroups.com y tortoisegit-users@googlegroups.com ." #. (para) #: ../source/TortoiseGit_en.xml:12964 @@ -10942,8 +10942,8 @@ msgstr "También mantenemos un users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." -msgstr "Si tiene una pregunta que no está contestada en ningún otro lugar, el mejor lugar para preguntar es en una de las listas de correo. users@TortoiseGit.tigris.org es la que debe utilizar si tiene preguntas acerca del uso de TortoiseGit. Si desea ayudar con el desarrollo de TortoiseGit, entonces debería tomar parte en las discusiones de dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." +msgstr "Si tiene una pregunta que no está contestada en ningún otro lugar, el mejor lugar para preguntar es en una de las listas de correo. tortoisegit-users@googlegroups.com es la que debe utilizar si tiene preguntas acerca del uso de TortoiseGit. Si desea ayudar con el desarrollo de TortoiseGit, entonces debería tomar parte en las discusiones de tortoisegit-dev@googlegroups.com ." #. (title) #: ../source/TortoiseGit_en.xml:12990 @@ -11002,8 +11002,8 @@ msgstr "mensaje vacío" #. (para) #: ../source/TortoiseGit_en.xml:13050 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." -msgstr "Hay dos formas de evitar que los usuarios puedan confirmar con un mensaje de registro vacío. Uno es específico de TortoiseGit, el otro funciona con todos los clientes de Subversion, pero necesita acceso directo al servidor." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." +msgstr "Hay dos formas de evitar que los usuarios puedan confirmar con un mensaje de registro vacío. Uno es específico de TortoiseGit, el otro funciona con todos los clientes de Git, pero necesita acceso directo al servidor." #. (title) #: ../source/TortoiseGit_en.xml:13056 @@ -11022,8 +11022,8 @@ msgstr "En la carpeta del repositorio en el servidor, hay una subcarpeta OK button disabled until the log message is long enough then please use the method described below." -msgstr "Este método es la forma recomendada si sus usuarios también utilizan otros clientes de Subversion además de TortoiseGit. La parte negativa es que la confirmación se rechaza por el servidor, y por tanto los usuarios obtendrán un mensaje de error. El cliente no puede saber antes de realizar la confirmación que se rechazará. Si desea que TortoiseGit deshabilite el botón Aceptar mientras el mensaje de registro sea demasiado corto, utilice el método descrito a continuación." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgstr "Este método es la forma recomendada si sus usuarios también utilizan otros clientes de Git además de TortoiseGit. La parte negativa es que la confirmación se rechaza por el servidor, y por tanto los usuarios obtendrán un mensaje de error. El cliente no puede saber antes de realizar la confirmación que se rechazará. Si desea que TortoiseGit deshabilite el botón Aceptar mientras el mensaje de registro sea demasiado corto, utilice el método descrito a continuación." #. (title) #: ../source/TortoiseGit_en.xml:13083 @@ -11169,8 +11169,8 @@ msgstr "Dado que TortoiseGit nunca pierde datos, sus revisiones deshechas #. (para) #: ../source/TortoiseGit_en.xml:13273 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." -msgstr "La única forma de quitar datos de un repositorio es utilizar la herramienta de línea de comandos de Subversion svnadmin. Puede encontrar una descripción sobre cómo funciona en Mantenimiento del repositorio." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgstr "La única forma de quitar datos de un repositorio es utilizar la herramienta de línea de comandos de Git svnadmin. Puede encontrar una descripción sobre cómo funciona en Mantenimiento del repositorio." #. (title) #: ../source/TortoiseGit_en.xml:13284 @@ -11234,8 +11234,8 @@ msgstr "Establece la propiedad svn:externals para una carpeta #. (para) #: ../source/TortoiseGit_en.xml:13367 -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." -msgstr "Confirme la nueva carpeta. Ahora, cuando actualice, Subversion traerá una copia de ese proyecto desde su repositorio en su copia de trabajo. Las subcarpetas se crearán automáticamente si es necesario. Cada vez que actualice su copia de trabajo, también recibirá la última versión de todos los proyectos externos." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgstr "Confirme la nueva carpeta. Ahora, cuando actualice, Git traerá una copia de ese proyecto desde su repositorio en su copia de trabajo. Las subcarpetas se crearán automáticamente si es necesario. Cada vez que actualice su copia de trabajo, también recibirá la última versión de todos los proyectos externos." #. (para) #: ../source/TortoiseGit_en.xml:13386 @@ -11249,8 +11249,8 @@ msgstr "Utilice una copia de trabajo anidada" #. (para) #: ../source/TortoiseGit_en.xml:13395 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" -msgstr "Cree una nueva carpeta dentro de su proyecto para contener el código común, pero no la añada a Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" +msgstr "Cree una nueva carpeta dentro de su proyecto para contener el código común, pero no la añada a Git" #. (para) #: ../source/TortoiseGit_en.xml:13399 @@ -11834,8 +11834,8 @@ msgstr "Dado que todos los comandos de TortoiseGit se controlan a través de par #. (para) #: ../source/TortoiseGit_en.xml:13902 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." -msgstr "Recuerde que TortoiseGit es un cliente GUI, y esta guía de automatización le muestra cómo conseguir que aparezcan los diálogos de TortoiseGit para recolectar información del usuario. Si desea escribir un script que no requiera entradas del usuario, debería utilizar el cliente de línea de comandos oficial de Subversion." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." +msgstr "Recuerde que TortoiseGit es un cliente GUI, y esta guía de automatización le muestra cómo conseguir que aparezcan los diálogos de TortoiseGit para recolectar información del usuario. Si desea escribir un script que no requiera entradas del usuario, debería utilizar el cliente de línea de comandos oficial de Git." #. (title) #. (title) @@ -12444,18 +12444,18 @@ msgstr "CLI" #. (para) #: ../source/TortoiseGit_en.xml:14492 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." -msgstr "A veces este manual hace referencia a la documentación principal de Subversion, que describe Subversion en términos del Interfaz de Línea de Comandos (CLI). Para ayudarle a entener lo que TortoiseGit hace tras el escenario, hemos compilado una lista mostrando los comandos CLI equivalentes a cada operación en la Interfaz de Usuario de TortoiseGit." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgstr "A veces este manual hace referencia a la documentación principal de Git, que describe Git en términos del Interfaz de Línea de Comandos (CLI). Para ayudarle a entener lo que TortoiseGit hace tras el escenario, hemos compilado una lista mostrando los comandos CLI equivalentes a cada operación en la Interfaz de Usuario de TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:14501 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." -msgstr "Incluso aunque hay equivalentes en CLI para lo que TortoiseGit hace, recuerde que TortoiseGit no llama al CLI sino que utiliza la librería de Subversion directamente." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." +msgstr "Incluso aunque hay equivalentes en CLI para lo que TortoiseGit hace, recuerde que TortoiseGit no llama al CLI sino que utiliza la librería de Git directamente." #. (para) #: ../source/TortoiseGit_en.xml:14507 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." -msgstr "Si cree que ha encontrado un error en TortoiseGit, puede que le pidamos que intente reproducirlo utilizando el CLI, para que podamos distinguir los problemas de TortoiseGit de los problemas de Subversion. Esta referencia le dice qué comando debe probar." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." +msgstr "Si cree que ha encontrado un error en TortoiseGit, puede que le pidamos que intente reproducirlo utilizando el CLI, para que podamos distinguir los problemas de TortoiseGit de los problemas de Git. Esta referencia le dice qué comando debe probar." #. (title) #: ../source/TortoiseGit_en.xml:14515 @@ -12518,8 +12518,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14565 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." -msgstr "A día de hoy, la actualización no es una operación atómica en Subversion. Por tanto, TortoiseGit primero encuentra la revisión HEAD del repositorio, y luego actualiza todos los ítems a ese número de revisión en concreto, evitando crear así una copia de trabajo mezclada." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgstr "A día de hoy, la actualización no es una operación atómica en Git. Por tanto, TortoiseGit primero encuentra la revisión HEAD del repositorio, y luego actualiza todos los ítems a ese número de revisión en concreto, evitando crear así una copia de trabajo mezclada." #. (para) #: ../source/TortoiseGit_en.xml:14572 @@ -12555,8 +12555,8 @@ msgstr "Si se marca Sólo obtener la carpeta superior, util #. (para) #: ../source/TortoiseGit_en.xml:14600 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." -msgstr "En TortoiseGit, el diálogo de confirmación utiliza varios comandos Subversion. La primera fase es una comprobación del estado que determina los ítems de su copia de trabajo que potencialmente pueden ser confirmados. Puede revisar la lista, comparar los ficheros contra BASE y seleccionar los ítems que desea incluir en la confirmación." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgstr "En TortoiseGit, el diálogo de confirmación utiliza varios comandos Git. La primera fase es una comprobación del estado que determina los ítems de su copia de trabajo que potencialmente pueden ser confirmados. Puede revisar la lista, comparar los ficheros contra BASE y seleccionar los ítems que desea incluir en la confirmación." #. (screen) #. (screen) @@ -12576,8 +12576,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14610 #: ../source/TortoiseGit_en.xml:14698 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." -msgstr "Si se marca Mostrar archivos no versionados, TortoiseGit le mostrará también todos los ficheros y carpetas no versionados en su jerarquía de la copia de trabajo, teniendo en cuenta las reglas de ignorar. Esta característica en concreto no tiene equivalente directo en Subversion, ya que el comando svn status no entra en carpetas no versionadas." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." +msgstr "Si se marca Mostrar archivos no versionados, TortoiseGit le mostrará también todos los ficheros y carpetas no versionados en su jerarquía de la copia de trabajo, teniendo en cuenta las reglas de ignorar. Esta característica en concreto no tiene equivalente directo en Git, ya que el comando svn status no entra en carpetas no versionadas." #. (para) #: ../source/TortoiseGit_en.xml:14618 @@ -12598,8 +12598,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14625 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." -msgstr "Cuando pulsa Aceptar, tiene lugar la confirmación en Subversion. Si ha dejado todas las casillas de selección de ficheros sin tocar tal y como aparecieron, TortoiseGit utilizará una única confirmación recursiva en la copia de trabajo. Si ha deseleccionado algún fichero, entonces se debe utilizar una confirmación no-recursiva (-N), y se debe especificar individualmente cada ruta en la línea de comandos de la confirmación." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgstr "Cuando pulsa Aceptar, tiene lugar la confirmación en Git. Si ha dejado todas las casillas de selección de ficheros sin tocar tal y como aparecieron, TortoiseGit utilizará una única confirmación recursiva en la copia de trabajo. Si ha deseleccionado algún fichero, entonces se debe utilizar una confirmación no-recursiva (-N), y se debe especificar individualmente cada ruta en la línea de comandos de la confirmación." #. (screen) #: ../source/TortoiseGit_en.xml:14633 @@ -12785,8 +12785,8 @@ msgstr "La primera fase es una comprobación del estado que determina los ítems #. (para) #: ../source/TortoiseGit_en.xml:14778 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." -msgstr "Cuando pulsa Aceptar, tiene lugar la operación de revertir en Subversion. Si ha dejado todas las casillas de selección de ficheros sin tocar tal y como aparecieron, TortoiseGit utilizará una única operación revertir recursivamente (-R) en la copia de trabajo. Si ha deseleccionado algún fichero, entonces se debe especificar individualmente cada ruta en la línea de comandos de la operación de revertir." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgstr "Cuando pulsa Aceptar, tiene lugar la operación de revertir en Git. Si ha dejado todas las casillas de selección de ficheros sin tocar tal y como aparecieron, TortoiseGit utilizará una única operación revertir recursivamente (-R) en la copia de trabajo. Si ha deseleccionado algún fichero, entonces se debe especificar individualmente cada ruta en la línea de comandos de la operación de revertir." #. (screen) #: ../source/TortoiseGit_en.xml:14785 @@ -12940,8 +12940,8 @@ msgstr "Esta forma se utiliza cuando se accede desde una carpeta sin versionar, #. (para) #: ../source/TortoiseGit_en.xml:14880 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." -msgstr "La exportación de una copia de trabajo a otro lugar se hace sin utilizar las bibliotecas de Subversion, por lo que no hay línea de comandos equivalente." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." +msgstr "La exportación de una copia de trabajo a otro lugar se hace sin utilizar las bibliotecas de Git, por lo que no hay línea de comandos equivalente." #. (para) #: ../source/TortoiseGit_en.xml:14885 @@ -13055,8 +13055,8 @@ msgstr "TortoiseGit crea un fichero de parche en formato diff unificado comparan #. (para) #: ../source/TortoiseGit_en.xml:14968 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." -msgstr "Aplicar parches es un trabajo complicado a no ser que el parche y la copia de trabajo estén en la misma revisión. Afortunadamente, puede utilizar TortoiseMerge, que no tiene equivalente directo en Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." +msgstr "Aplicar parches es un trabajo complicado a no ser que el parche y la copia de trabajo estén en la misma revisión. Afortunadamente, puede utilizar TortoiseMerge, que no tiene equivalente directo en Git." #. (title) #: ../source/TortoiseGit_en.xml:14982 @@ -13075,8 +13075,8 @@ msgstr "prioridad de sobreimpresión" #. (para) #: ../source/TortoiseGit_en.xml:14997 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." -msgstr "Cada fichero y carpeta tiene un valor del estado de Subversion tal y como lo devuelve la librería de Subversion. En el cliente de línea de comandos, estos valores se representan por códigos de una única letra, pero en TortoiseGit se muestran gráficamente utilizando los iconos sobreimpresionados. Dado que el número de sobreimpresiones es muy limitado, cada sobreimpresión puede representar uno de varios valores de estado." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgstr "Cada fichero y carpeta tiene un valor del estado de Git tal y como lo devuelve la librería de Git. En el cliente de línea de comandos, estos valores se representan por códigos de una única letra, pero en TortoiseGit se muestran gráficamente utilizando los iconos sobreimpresionados. Dado que el número de sobreimpresiones es muy limitado, cada sobreimpresión puede representar uno de varios valores de estado." #. (para) #: ../source/TortoiseGit_en.xml:15005 @@ -13100,13 +13100,13 @@ msgstr " La sobreimpresión The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." -msgstr " La sobreimpresión En Subversion se utiliza para representar un ítem que está en el estado normal, o un ítem versionado cuyo estado aún se desconoce. dado que TortoiseGit utiliza un proceso de caché en segundo plano para obtener los estados, puede llevar unos pocos segundos antes deque se actualice la sobreimpresión." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgstr " La sobreimpresión En Git se utiliza para representar un ítem que está en el estado normal, o un ítem versionado cuyo estado aún se desconoce. dado que TortoiseGit utiliza un proceso de caché en segundo plano para obtener los estados, puede llevar unos pocos segundos antes deque se actualice la sobreimpresión." #. (para) #: ../source/TortoiseGit_en.xml:15048 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." -msgstr " La sobreimpresión Necesita bloqueo se utiliza para indicar cuándo un fichero tiene la establecida la propiedad svn:needs-lock. Para las copias de trabajo que fueron creadas utilizando Subversion 1.4.0 y posteriores, el estado svn:needs-lock se guarda en la caché local por Subversion y se utiliza para determinar cuándo mostrar esta sobreimpresión. Para copias de trabajo que están en formato pre-1.4.x, TortoiseGit muestra esta sobreimpresión cuando el fichero tiene el estado de sólo-lectura. Tenga en cuenta que Subversion automáticamente actualiza las copias de trabajo cuando las actualiza, aunque el almacenamiento en caché de la propiedad svn:needs-lock puede no realizarse hasta que el propio fichero se actualice." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgstr " La sobreimpresión Necesita bloqueo se utiliza para indicar cuándo un fichero tiene la establecida la propiedad svn:needs-lock. Para las copias de trabajo que fueron creadas utilizando Git 1.4.0 y posteriores, el estado svn:needs-lock se guarda en la caché local por Git y se utiliza para determinar cuándo mostrar esta sobreimpresión. Para copias de trabajo que están en formato pre-1.4.x, TortoiseGit muestra esta sobreimpresión cuando el fichero tiene el estado de sólo-lectura. Tenga en cuenta que Git automáticamente actualiza las copias de trabajo cuando las actualiza, aunque el almacenamiento en caché de la propiedad svn:needs-lock puede no realizarse hasta que el propio fichero se actualice." #. (para) #: ../source/TortoiseGit_en.xml:15062 @@ -13125,13 +13125,13 @@ msgstr " La sobreimpresión none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." -msgstr "Si un ítem tiene el estado de Subversion ninguno (el ítem no está dentro de una copia de trabajo), entonces no se mostrará ninguna sobreimpresión. Si ha escogido deshabilitar las sobreimpresiones Ignorado y Sin versionar entonces tampoco se mostrarán las sobreimpresiones para estos ficheros." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgstr "Si un ítem tiene el estado de Git ninguno (el ítem no está dentro de una copia de trabajo), entonces no se mostrará ninguna sobreimpresión. Si ha escogido deshabilitar las sobreimpresiones Ignorado y Sin versionar entonces tampoco se mostrarán las sobreimpresiones para estos ficheros." #. (para) #: ../source/TortoiseGit_en.xml:15090 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." -msgstr "Un ítem sólo puede tener un valor de estado de Subversion. Por ejemplo un fichero puede estar modificado localmente y puede estar marcado para su eliminación al mismo tiempo. Subversion devuelve un único valor de estado - en este caso eliminado. Estas prioridades están definidas en el propio Subversion." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." +msgstr "Un ítem sólo puede tener un valor de estado de Git. Por ejemplo un fichero puede estar modificado localmente y puede estar marcado para su eliminación al mismo tiempo. Git devuelve un único valor de estado - en este caso eliminado. Estas prioridades están definidas en el propio Git." #. (para) #: ../source/TortoiseGit_en.xml:15097 @@ -13175,23 +13175,23 @@ msgstr "Asegurando Svnserve utilizando SSH" #. (para) #: ../source/TortoiseGit_en.xml:15160 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." -msgstr "Esta sección proporciona una guía paso-a-paso para configurar Subversion y TortoiseGit para utilizar el protocolo svn+ssh. Si ya está utilizando conexiones SSH autenticadas para identificarse en su servidor, entonces esto ya lo tiene hecho y puede encontrar más detalles en el libro de Subversion. Si no está utilizando SSH pero le gustaría hacerlo para proteger su instalación de Subversion, esta guía le proporciona un método simple con el que no necesita crear una cuenta de usuario SSH diferente en el servidor para cada usuario de Subversion." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." +msgstr "Esta sección proporciona una guía paso-a-paso para configurar Git y TortoiseGit para utilizar el protocolo svn+ssh. Si ya está utilizando conexiones SSH autenticadas para identificarse en su servidor, entonces esto ya lo tiene hecho y puede encontrar más detalles en el libro de Git. Si no está utilizando SSH pero le gustaría hacerlo para proteger su instalación de Git, esta guía le proporciona un método simple con el que no necesita crear una cuenta de usuario SSH diferente en el servidor para cada usuario de Git." #. (para) #: ../source/TortoiseGit_en.xml:15170 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." -msgstr "En esta implementación creamos una única cuenta de usuario SSH para todos los usuarios de Subversion, y utilizamos diferentes claves de autenticación para diferenciar entre los usuarios reales de Subversion." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." +msgstr "En esta implementación creamos una única cuenta de usuario SSH para todos los usuarios de Git, y utilizamos diferentes claves de autenticación para diferenciar entre los usuarios reales de Git." #. (para) #: ../source/TortoiseGit_en.xml:15175 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." -msgstr "En este apéndice asumimos que ya tiene las herramientas de Subversion instaladas, y que ha creado un repositorio tal y como se describe en alguna sección de este manual. Tenga en cuenta que no debería iniciar svnserve como un servicio o demonio cuando se utilice con SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgstr "En este apéndice asumimos que ya tiene las herramientas de Git instaladas, y que ha creado un repositorio tal y como se describe en alguna sección de este manual. Tenga en cuenta que no debería iniciar svnserve como un servicio o demonio cuando se utilice con SSH." #. (para) #: ../source/TortoiseGit_en.xml:15181 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" -msgstr "Mucha de esta información viene de un tutorial proporcionado por Marc Logemann, que puede encontrarse en www.logemann.org Thorsten Müller ha proporcionado información adicional sobre cómo configurar un servidor Windows. ¡Gracias tíos!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgstr "Mucha de esta información viene de un tutorial proporcionado por Marc Logemann, que puede encontrarse en www.logemann.org Thorsten Müller ha proporcionado información adicional sobre cómo configurar un servidor Windows. ¡Gracias tíos!" #. (title) #: ../source/TortoiseGit_en.xml:15192 @@ -13211,8 +13211,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15202 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." -msgstr "Un punto a tener en cuenta es que si compila Subversion desde el código fuente y no proporciona ningún argumento a ./configure, Subversion crea un directorio bin bajo /usr/local y pone sus binarios ahí. Si desea utilizar el modo túnel con SSH, debe asegurarse de que el usuario que haga login via SSH necesita ejecutar el programa svnserve y algunos otros binarios. Por esta razón, o bien ponga /usr/local/bin en la variable PATH, cree enlaces simbólicos de sus binarios en el directorio /usr/sbin o en cualquier otro directorio que esté incluido en el PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgstr "Un punto a tener en cuenta es que si compila Git desde el código fuente y no proporciona ningún argumento a ./configure, Git crea un directorio bin bajo /usr/local y pone sus binarios ahí. Si desea utilizar el modo túnel con SSH, debe asegurarse de que el usuario que haga login via SSH necesita ejecutar el programa svnserve y algunos otros binarios. Por esta razón, o bien ponga /usr/local/bin en la variable PATH, cree enlaces simbólicos de sus binarios en el directorio /usr/sbin o en cualquier otro directorio que esté incluido en el PATH." #. (para) #: ../source/TortoiseGit_en.xml:15215 @@ -13373,8 +13373,8 @@ msgstr "Comprobando SSH con TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:15365 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." -msgstr "Por ahora sólo hemos comprobado que puede hacer login utilizando SSH. Ahora debemos asegurarnos de que la conexión SSH realmente puede ejecutar svnserve. En el servidor modifique /home/svnuser/.ssh/authorized_keys para permitir que varios autores de Subversion utilicen la misma cuenta del sistema, svnuser. Tenga en cuenta que cada autor de Subversion utiliza el mismo login pero una clave de autenticación diferente, por lo tanto deberá añadir una línea por cada autor." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." +msgstr "Por ahora sólo hemos comprobado que puede hacer login utilizando SSH. Ahora debemos asegurarnos de que la conexión SSH realmente puede ejecutar svnserve. En el servidor modifique /home/svnuser/.ssh/authorized_keys para permitir que varios autores de Git utilicen la misma cuenta del sistema, svnuser. Tenga en cuenta que cada autor de Git utiliza el mismo login pero una clave de autenticación diferente, por lo tanto deberá añadir una línea por cada autor." #. (para) #: ../source/TortoiseGit_en.xml:15374 @@ -13488,8 +13488,8 @@ msgstr "Glosario" #. (para) #: ../source/TortoiseGit_en.xml:15511 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Un comando de Subversion que se utiliza para añadir un fichero o un directorio a su copia de trabajo. Los nuevos ítems se añaden al repositorio cuando confirme." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Un comando de Git que se utiliza para añadir un fichero o un directorio a su copia de trabajo. Los nuevos ítems se añaden al repositorio cuando confirme." #. (glossterm) #: ../source/TortoiseGit_en.xml:15519 @@ -13523,23 +13523,23 @@ msgstr "Rama" #. (para) #: ../source/TortoiseGit_en.xml:15553 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Un término de uso frecuente en los sistemas de control de versiones para describir lo que ocurre cuando el desarrollo se parte en un punto en concreto y sigue dos caminos separados. Puede crear una rama desde la línea principal de desarrollo para desarrollar una nueva funcionalidad sin hacer que la línea principal quede inestable. O puede hacer una rama de una versión estable en la que sólo hará correcciones de errores, mientras los nuevos desarrollos tienen lugar en el inestable tronco. En Subversion una rama se implementa como una copia barata." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Un término de uso frecuente en los sistemas de control de versiones para describir lo que ocurre cuando el desarrollo se parte en un punto en concreto y sigue dos caminos separados. Puede crear una rama desde la línea principal de desarrollo para desarrollar una nueva funcionalidad sin hacer que la línea principal quede inestable. O puede hacer una rama de una versión estable en la que sólo hará correcciones de errores, mientras los nuevos desarrollos tienen lugar en el inestable tronco. En Git una rama se implementa como una copia barata." #. (para) #: ../source/TortoiseGit_en.xml:15568 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Un comando de Subversion que crea una copia local de trabajo en un directorio vacío al descargar los ficheros versionados desde el repositorio." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Un comando de Git que crea una copia local de trabajo en un directorio vacío al descargar los ficheros versionados desde el repositorio." #. (para) #: ../source/TortoiseGit_en.xml:15577 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Citando el libro de Subversion: Limpia recursivamente la copia de trabajo, eliminando los bloqueos y continuando las operaciones sin terminar. Si alguna vez obtiene un error copia de trabajo bloqueada, ejecute este comando para eliminar los bloqueos y conseguir que su copia de trabajo vuelva a un estado usable de nuevo. Tenga en cuenta que en este contexto bloqueado se refiere a un bloqueo del sistema de ficheros local, no a bloqueos del repositorio." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Citando el libro de Git: Limpia recursivamente la copia de trabajo, eliminando los bloqueos y continuando las operaciones sin terminar. Si alguna vez obtiene un error copia de trabajo bloqueada, ejecute este comando para eliminar los bloqueos y conseguir que su copia de trabajo vuelva a un estado usable de nuevo. Tenga en cuenta que en este contexto bloqueado se refiere a un bloqueo del sistema de ficheros local, no a bloqueos del repositorio." #. (para) #: ../source/TortoiseGit_en.xml:15594 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Este comando de Subversion se utiliza para pasar los cambios desde su copia de trabajo local al repositorio, creando una nueva revisión en el repositorio." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Este comando de Git se utiliza para pasar los cambios desde su copia de trabajo local al repositorio, creando una nueva revisión en el repositorio." #. (glossterm) #: ../source/TortoiseGit_en.xml:15602 @@ -13548,8 +13548,8 @@ msgstr "Conflicto" #. (para) #: ../source/TortoiseGit_en.xml:15604 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Cuando los cambios desde el repositorio se mezclan con los cambios locales, a veces esos cambios ocurren en las mismas líneas. En este caso Subversion no puede decidir automáticamente qué versión utilizar, y se dice que el fichero está en conflicto. Tiene que editar el fichero manualmente y resolver el conflicto antes de que pueda confirmar más cambios." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Cuando los cambios desde el repositorio se mezclan con los cambios locales, a veces esos cambios ocurren en las mismas líneas. En este caso Git no puede decidir automáticamente qué versión utilizar, y se dice que el fichero está en conflicto. Tiene que editar el fichero manualmente y resolver el conflicto antes de que pueda confirmar más cambios." #. (glossterm) #: ../source/TortoiseGit_en.xml:15614 @@ -13558,8 +13558,8 @@ msgstr "Copiar" #. (para) #: ../source/TortoiseGit_en.xml:15616 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "En un repositorio de Subversion puede crear una copia de un único fichero o un árbol completo. Estos se implementan como copias baratas que actúan un poco como un enlace al original en el sentido de que casi no ocupan espacio. Haciendo una copia preserva la historia del ítem en la copia, por lo que puede rastrear los cambios que se hicieron antes de que ocurriera la copia." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "En un repositorio de Git puede crear una copia de un único fichero o un árbol completo. Estos se implementan como copias baratas que actúan un poco como un enlace al original en el sentido de que casi no ocupan espacio. Haciendo una copia preserva la historia del ítem en la copia, por lo que puede rastrear los cambios que se hicieron antes de que ocurriera la copia." #. (para) #: ../source/TortoiseGit_en.xml:15628 @@ -13583,8 +13583,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15659 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Un sistema de ficheros propietario de Subversion que se utiliza como soporte de los repositorios. Se puede utilizar en unidades compartidas de red. Se utiliza por defecto para los repositorios creados a partir de la versión 1.2." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Un sistema de ficheros propietario de Git que se utiliza como soporte de los repositorios. Se puede utilizar en unidades compartidas de red. Se utiliza por defecto para los repositorios creados a partir de la versión 1.2." #. (para) #: ../source/TortoiseGit_en.xml:15668 @@ -13603,8 +13603,8 @@ msgstr "La última revisión de un fichero o una carpeta en el reposit #. (para) #: ../source/TortoiseGit_en.xml:15684 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Comando de Subversion para importar una jerarquía de carpetas completa en el repositorio en una única revisión." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Comando de Git para importar una jerarquía de carpetas completa en el repositorio en una única revisión." #. (para) #: ../source/TortoiseGit_en.xml:15693 @@ -13648,8 +13648,8 @@ msgstr "Parche" #. (para) #: ../source/TortoiseGit_en.xml:15737 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Si una copia de trabajo tiene cambios únicamente en ficheros de texto, es posible utilizar el comando Diff de Subversion para generar un único fichero con el resúmen de esos cambios en el formato de Diff unificado. Un fichero de este tipo a menudo se denomina Parche, y puede ser enviado por email a otro (o a una lista de correo) y apllicado en otra copia de trabajo. Alguien sin acceso de confirmación puede hacer cambios y enviar un fichero de parche para que lo aplique un confirmador autorizado. O si no está seguro de un cambio, puede enviar el parche a otros para que lo revisen." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Si una copia de trabajo tiene cambios únicamente en ficheros de texto, es posible utilizar el comando Diff de Git para generar un único fichero con el resúmen de esos cambios en el formato de Diff unificado. Un fichero de este tipo a menudo se denomina Parche, y puede ser enviado por email a otro (o a una lista de correo) y apllicado en otra copia de trabajo. Alguien sin acceso de confirmación puede hacer cambios y enviar un fichero de parche para que lo aplique un confirmador autorizado. O si no está seguro de un cambio, puede enviar el parche a otros para que lo revisen." #. (glossterm) #: ../source/TortoiseGit_en.xml:15750 @@ -13658,8 +13658,8 @@ msgstr "Propiedad" #. (para) #: ../source/TortoiseGit_en.xml:15752 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Además de versionar sus directorios y ficheros, Subversion le permite añadir metainformación versionada - llamadas propiedades para cada uno de sus directorios y ficheros versionados. Cada propiedad tiene un nombre y un valor, como un entrada del registro. Subversion tiene algunas propiedades especiales que utiliza internamente, como svn:eol-style. TortoiseGit también tiene algunas, como tsvn:logminsize. Puede añadir sus propias propiedades con cualquier nombre y valor que quiera." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Además de versionar sus directorios y ficheros, Git le permite añadir metainformación versionada - llamadas propiedades para cada uno de sus directorios y ficheros versionados. Cada propiedad tiene un nombre y un valor, como un entrada del registro. Git tiene algunas propiedades especiales que utiliza internamente, como svn:eol-style. TortoiseGit también tiene algunas, como tsvn:logminsize. Puede añadir sus propias propiedades con cualquier nombre y valor que quiera." #. (para) #: ../source/TortoiseGit_en.xml:15767 @@ -13688,8 +13688,8 @@ msgstr "Cuando los ficheros en una copia de trabajo se quedan en un estado de co #. (para) #: ../source/TortoiseGit_en.xml:15807 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion maniene una copia local prístina de cada fichero tal y como estaban cuando actualizó su copia de trabajo por última vez. Si ha hecho cambios y decide que quiere deshacelros, puede utilizar el comando revertir para volver a la copia prístina." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git maniene una copia local prístina de cada fichero tal y como estaban cuando actualizó su copia de trabajo por última vez. Si ha hecho cambios y decide que quiere deshacelros, puede utilizar el comando revertir para volver a la copia prístina." #. (glossterm) #: ../source/TortoiseGit_en.xml:15816 @@ -13723,13 +13723,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:15848 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Una abreviatura muy usada para Subversion." +msgid "A frequently-used abbreviation for Git." +msgstr "Una abreviatura muy usada para Git." #. (para) #: ../source/TortoiseGit_en.xml:15851 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "El nombre del protocolo personalizado de Subversion que utiliza el servidor de repositorios svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "El nombre del protocolo personalizado de Git que utiliza el servidor de repositorios svnserve." #. (para) #: ../source/TortoiseGit_en.xml:15860 @@ -13738,8 +13738,8 @@ msgstr "De la misma forma que Actualizar-a-la-revisión cambia la #. (para) #: ../source/TortoiseGit_en.xml:15874 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Este comando de Subversion incorpora los últimos cambios del repositorio a su copia de trabajo, fusionando cualquier cambio hecho por otros con los cambios locales en la copia de trabajo." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Este comando de Git incorpora los últimos cambios del repositorio a su copia de trabajo, fusionando cualquier cambio hecho por otros con los cambios locales en la copia de trabajo." #. (glossterm) #: ../source/TortoiseGit_en.xml:15882 @@ -13778,14 +13778,14 @@ msgstr "Traducción" #~ "estará incompleta. Además, si el servidor no tiene una base de datos de " #~ "registro de fusiones, la obtención de la información será muy lenta." #~ msgid "" -#~ "Get the latest version of Subversion from http://" -#~ "subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." #~ msgstr "" -#~ "Obtenga la última versión de Subversion desde http://subversion.tigris.org/servlets/ProjectDocumentList?" +#~ "Obtenga la última versión de Git desde http://Git.tigris.org/servlets/ProjectDocumentList?" #~ "folderID=91." #, fuzzy @@ -13804,20 +13804,20 @@ msgstr "Traducción" #~ msgid "Cyrus SASL Support" #~ msgstr "Soporte para Cyrus SASL" #~ msgid "" -#~ "Starting with Subversion 1.5.0, svnserve and TortoiseGit support Cyrus " +#~ "Starting with Git 1.5.0, svnserve and TortoiseGit support Cyrus " #~ "SASL (Simple Authentication and Security Layer) for the svn:// protocol. You can find further information in this subversion " +#~ "filename> protocol. You can find further information in this Git " #~ "app note: Using Cyrus SASL Authentication with SubversionUsing Cyrus SASL Authentication with Git." #~ msgstr "" -#~ "Empezando con la versión de Subversion 1.5.0, svnserve y TortoiseGit " +#~ "Empezando con la versión de Git 1.5.0, svnserve y TortoiseGit " #~ "ofrecen soporte para Cyrus SASL (acrónimo de Simple Authentication and " #~ "Security Layer, Capa de seguridad y autenticación simple) para el " #~ "protocolo svn://. Puede encontrar más información en " -#~ "esta nota de aplicación de Subversion: Utilizando la Autenticación " -#~ "Cyrus SASL con Subversion." +#~ "Cyrus SASL con Git." #~ msgid "" #~ "So if you haven't already created a basic folder structure inside your " #~ "repository you should do that now: " @@ -13837,23 +13837,23 @@ msgstr "Traducción" #~ "En este diálogo tiene que introducir la URL del repositorio en el que " #~ "quiere importar su proyecto." #~ msgid "" -#~ "The Subversion import command has limited functionality - you cannot " +#~ "The Git import command has limited functionality - you cannot " #~ "easily pick items for import. Also, the folder you are importing does not " -#~ "become a Subversion working copy - you have to do a separate checkout. " +#~ "become a Git working copy - you have to do a separate checkout. " #~ "But don't worry, there is another way of working which overcomes both " #~ "these shortcomings :-)" #~ msgstr "" -#~ "El comando de Subversion importar tiene una funcionalidad limitada - no " +#~ "El comando de Git importar tiene una funcionalidad limitada - no " #~ "puede seleccionar fácilmente qué elementos desea importar. Por otra " #~ "parte, la carpeta desde la que está importando no se convierte en una " -#~ "copia de trabajo de Subversion - tiene que hacer una operación de obtener " +#~ "copia de trabajo de Git - tiene que hacer una operación de obtener " #~ "adicional. Pero no se preocupe, hay otra forma de trabajar que elimina " #~ "estas restricciones :-)" #, fuzzy #~ msgid "" #~ "Note that if you change the URL in an svn:externals " -#~ "property, then next time you update your working copy Subversion will " +#~ "property, then next time you update your working copy Git will " #~ "delete the old external folder and make a fresh checkout, so you will see " #~ "files being Added, rather than being " #~ "Updated as you might have expected. This situation " @@ -13863,7 +13863,7 @@ msgstr "Traducción" #~ msgstr "" #~ "Tenga en cuenta que si cambia la URL en una propiedad svn:" #~ "externals, la siguiente vez que actualice su copia de trabajo " -#~ "Subversion borrará la carpeta externa antigua y obtendrá una copia de " +#~ "Git borrará la carpeta externa antigua y obtendrá una copia de " #~ "trabajo nueva, por lo que verá que los ficheros serán Añadidos, en vez de ser Actualizados como podría " #~ "esperarse. Esta situación puede ocurrir si se refiere a una etiqueta de " @@ -13905,11 +13905,11 @@ msgstr "Traducción" #~ msgid "" #~ "If you really need to access a repository through a network share, create " #~ "the repository with FSFS format. If you need to provide server access as " -#~ "well, you will need Subversion Server 1.1 or higher." +#~ "well, you will need Git Server 1.1 or higher." #~ msgstr "" #~ "Si realmente necesita acceder a un repositorio a través de una unidad de " #~ "red compartida, cree el repositorio con el formato fsfs. Si también tiene " -#~ "que dar acceso via servidor, necesitará un Servidor de Subversion 1.1 o " +#~ "que dar acceso via servidor, necesitará un Servidor de Git 1.1 o " #~ "posterior." #~ msgid "" #~ "Brings up the branch/tag dialog. The is the working copy " @@ -13980,7 +13980,7 @@ msgstr "Traducción" #~ msgid "" #~ "When you checkout an existing source tree from the repository, you should " #~ "do so in an empty directory. If you try to check out your source tree " -#~ "into the same directory that you imported from, Subversion will throw an " +#~ "into the same directory that you imported from, Git will throw an " #~ "error message because it will not overwrite the existing unversioned " #~ "files with versioned ones, even if they are identical. You will have to " #~ "check out into a different directory or delete the existing source tree " @@ -13989,7 +13989,7 @@ msgstr "Traducción" #~ msgstr "" #~ "Sólo debería obtener en un directorio vacío. Si quiere obtener su árbol " #~ "de código en el mismo directorio desde el que realizó la importación, " -#~ "Subversion le dará un mensaje de error porque no puede sobreescribir los " +#~ "Git le dará un mensaje de error porque no puede sobreescribir los " #~ "ficheros no versionados que ya existen con los ficheros versionados. " #~ "Deberá obtener en un directorio diferente o borrar antes la carpeta con " #~ "el árbol de código existente." diff --git a/doc/po/TortoiseSVN_fa.po b/doc/po/TortoiseSVN_fa.po index feeb887..a00f950 100644 --- a/doc/po/TortoiseSVN_fa.po +++ b/doc/po/TortoiseSVN_fa.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2008-05-30 19:02 +0000\n" "PO-Revision-Date: 2008-07-08 22:59+0330\n" "Last-Translator: mohsen sajjadi \n" -"Language-Team: TortoiseGit translation team <>\n" +"Language-Team: TortoiseGit translation team <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -33,7 +33,7 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" +msgid "A Git client for Windows" msgstr "یک ابزار سرویس گیرنده سابورژن برای ویندوز" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated @@ -114,7 +114,7 @@ msgstr "مخاطبین" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." msgstr "این کتاب برای افراد باسواد کامپیوتر که میخواهند از سابورژن برای مدیریت اطلاعاتشان استفاده کنند، ولی با نسخه خط فرمانی آن راحت نیستند، نوشته شده است. از آنجا که TortoiseGit یک توسعه پوسته ویندوز است، ما فرض میکنیم کاربران با ویندوز اکسپلورر آشنا بوده و نحوه کار با آن را میدانند." #. (title) @@ -134,17 +134,17 @@ msgstr " توضیح میدهد که Tortois #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." msgstr "در مقدمه ای بر سابورژن سیستم مدیریت ویرایش در پشت TortoiseGit را خواهیم داشت. این بخش از مستندات سابورژن قرض گرفته شده و روشهای مختلف انجام کنترل ویرایشها و نحوه کار سابورژن را توضیح میدهد." #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." msgstr "بیشتر کاربران سابورژن هرگز نیاز به راه اندازی یک سرور برای خود نخواهند داشت. بخش بعد به نحوه راه اندازی چنین سروری میپردازد و برای مدیران سیستم مناسب میباشد." #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." msgstr "بخش مربوط به نحوه راه اندازی یک مخزن محلی را توضیح میدهد، و برای آزمایش سابورژن و TortoiseGit روی یک سیستم کاربرد دارد.. همچنین در مورد مدیریت یک مخزن روی یک سرویس دهنده نیز توضیحاتی ارائه خواهد شد." #. (para) @@ -169,7 +169,7 @@ msgstr "بخش نشان میدهد چگون #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." msgstr "در درباره ارتباط بین دستورات TortoiseGit و معادل آنها در svn.exe که سرویس گیرنده خط دستوری سابورژن است توضیحاتی ارائه میشود." #. (title) @@ -194,7 +194,7 @@ msgstr "جامعه" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." msgstr "هردو برنامه TortoiseGit و سابورژن توسط جامعه ای از افراد که روی این پروژه ها کار میکنند توسعه داده می شوند. این افراد اهل کشورهای مختلف هستند و برای ایجاد برنامه های جذاب دست به دست هم داده اند." #. (title) @@ -244,12 +244,12 @@ msgstr "برای کمک در مستند سازی و رفع ابرادات" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" +msgid "The Git Book" msgstr "کتاب سابورژن" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" +msgid "for the great introduction to Git and its chapter 2 which we copied here" msgstr "برای مقدمه عالی سابورژن و فصل 2 آن که ما در اینجا آنرا کپی برداری کرده ایم" #. (term) @@ -363,12 +363,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." msgstr "" #. (title) @@ -378,17 +378,17 @@ msgstr "تاریخچه TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." msgstr "" #. (title) @@ -398,7 +398,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." msgstr "" #. (term) @@ -438,17 +438,17 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" +msgid "Easy access to Git commands" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" msgstr "" #. (term) @@ -458,7 +458,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." msgstr "" #. (term) @@ -488,7 +488,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." msgstr "" #. (term) @@ -498,7 +498,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." msgstr "" #. (term) @@ -508,7 +508,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." msgstr "" #. (term) @@ -518,7 +518,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." msgstr "" #. (title) @@ -663,22 +663,22 @@ msgstr "اصول اولیه" #. (primary) #: ../source/TortoiseGit_en.xml:724 -msgid "Subversion book" +msgid "Git book" msgstr "کتاب سابورژن" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." msgstr "این فصل نسخه اصلاح شده ای از همین فصل از کتاب سابورژن میباشد. نسخه بر خطی از کتاب سابورژن در این آدرس وجود دارد: http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." msgstr "این فصل مقدمه این کوتاه و مختصر به سابورژن ارائه میکند. اگر تازه با مقوله کنترل نسخ آشنا شده اید، این فصل برای شماست. فصل را با بررسی اصول عمومی کنترل نسخ شروع میکنیم، سپس برخی ایده ها ی پشت سابورژن را بررسی کرده و به مثال هائی از نحوه استفاده از سابورژن میپردازیم." #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." msgstr "" #. (title) @@ -699,7 +699,7 @@ msgstr "مخزن" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." msgstr "" #. (title) @@ -709,7 +709,7 @@ msgstr "یک سیستم سرویس دهنده/سرویس گیرنده معمول #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." msgstr "" #. (para) @@ -784,7 +784,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." msgstr "" #. (para) @@ -826,17 +826,17 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" +msgid "What does Git Do?" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" +msgid "Git in Action" msgstr "" #. (title) @@ -851,27 +851,27 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." msgstr "" #. (para) @@ -896,12 +896,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1058 -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." +msgid "To publish your changes to others, you can use Git's commit command." msgstr "" #. (para) @@ -911,17 +911,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." msgstr "" #. (title) @@ -931,7 +931,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" msgstr "" #. (title) @@ -968,7 +968,7 @@ msgstr "" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." +msgid "Access via WebDAV protocol to Git-aware Apache server." msgstr "" #. (literal) @@ -1014,7 +1014,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." msgstr "" #. (para) @@ -1069,7 +1069,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." msgstr "" #. (para) @@ -1089,7 +1089,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" msgstr "" #. (para) @@ -1139,7 +1139,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." msgstr "" #. (title) @@ -1149,7 +1149,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" msgstr "" #. (para) @@ -1164,7 +1164,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" msgstr "" #. (term) @@ -1204,7 +1204,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." msgstr "" #. (title) @@ -1214,7 +1214,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" msgstr "" #. (para) @@ -1224,12 +1224,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." msgstr "" #. (title) @@ -1239,12 +1239,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." msgstr "" #. (para) @@ -1269,7 +1269,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" msgstr "" #. (primary) @@ -1281,7 +1281,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." msgstr "" #. (term) @@ -1291,7 +1291,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." msgstr "" #. (term) @@ -1373,17 +1373,17 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" +msgid "Installing Git" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." msgstr "" #. (primary) @@ -1395,12 +1395,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." msgstr "" #. (para) @@ -1437,12 +1437,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" #. (para) @@ -1462,12 +1462,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " msgstr "" #. (primary) @@ -1506,17 +1506,17 @@ msgstr "" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " +msgid "means that the Git repositories are available from the URL " msgstr "" #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." msgstr "" #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." msgstr "" #. (filename) @@ -1526,7 +1526,7 @@ msgstr "" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " +msgid "tells Git to look for repositories below " msgstr "" #. (entry) @@ -1551,7 +1551,7 @@ msgstr "" #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" +msgid "Location of the Access file for paths inside a Git repository" msgstr "" #. (entry) @@ -1576,7 +1576,7 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" #. (para) @@ -1614,12 +1614,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1956 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1970 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." msgstr "" #. (title) @@ -1634,7 +1634,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1985 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." msgstr "" #. (para) @@ -1739,7 +1739,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2094 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1771,7 +1771,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2141 -msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." msgstr "" #. (para) @@ -1781,7 +1781,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2151 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." msgstr "" #. (para) @@ -1791,7 +1791,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2167 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." msgstr "" #. (title) @@ -1806,7 +1806,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2185 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." msgstr "" #. (para) @@ -1832,7 +1832,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1932,12 +1932,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2340 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2354 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." msgstr "" #. (para) @@ -1967,7 +1967,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2396 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." msgstr "" #. (para) @@ -1979,7 +1979,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -1999,7 +1999,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2425 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." msgstr "" #. (para) @@ -2010,7 +2010,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2441 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" @@ -2029,10 +2029,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2051,7 +2051,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2486 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." msgstr "" #. (para) @@ -2066,22 +2066,22 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2503 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2517 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2523 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2529 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" msgstr "" #. (title) @@ -2139,7 +2139,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2625 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." msgstr "" #. (para) @@ -2147,15 +2147,15 @@ msgstr "" msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" @@ -2169,7 +2169,7 @@ msgstr "" msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" #. (para) @@ -2231,7 +2231,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2756 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" msgstr "" #. (title) @@ -2251,12 +2251,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2780 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2788 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." msgstr "" #. (title) @@ -2274,12 +2274,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2811 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2816 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." msgstr "" #. (para) @@ -2354,7 +2354,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2916 -msgid "Further information about svnserve can be found in the Version Control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." msgstr "" #. (title) @@ -2365,7 +2365,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2925 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." @@ -2373,12 +2373,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2947 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2952 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." +msgid "If you haven't created a Git repository yet, it's time to do that now." msgstr "" #. (title) @@ -2393,7 +2393,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2964 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." msgstr "" #. (title) @@ -2500,7 +2500,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3095 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." msgstr "" #. (para) @@ -2540,7 +2540,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3142 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." msgstr "" #. (para) @@ -2626,7 +2626,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3221 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." msgstr "" #. (para) @@ -2703,7 +2703,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3333 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." msgstr "" #. (title) @@ -2730,7 +2730,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3358 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." msgstr "" #. (para) @@ -2776,7 +2776,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3412 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." msgstr "" #. (para) @@ -2819,17 +2819,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3451 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3459 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3466 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." msgstr "" #. (para) @@ -2844,12 +2844,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3488 -msgid "You should know the basics of Subversion." +msgid "You should know the basics of Git." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3493 -msgid "You should have set up a server and/or have access to a Subversion repository." +msgid "You should have set up a server and/or have access to a Git repository." msgstr "" #. (para) @@ -3039,12 +3039,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3644 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3675 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." msgstr "" #. (para) @@ -3120,7 +3120,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3730 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "" #. (para) @@ -3235,7 +3235,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3910 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." msgstr "" #. (title) @@ -3263,11 +3263,11 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3934 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" #. (para) @@ -3296,7 +3296,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4010 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." msgstr "" #. (term) @@ -3612,7 +3612,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4415 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." msgstr "" #. (para) @@ -3636,7 +3636,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4443 #: ../source/TortoiseGit_en.xml:5244 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #. (title) @@ -3648,7 +3648,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4459 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "" #. (title) @@ -3922,7 +3922,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4788 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." msgstr "" #. (para) @@ -3972,19 +3972,19 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4867 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4822 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" #. (para) @@ -3999,7 +3999,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4901 -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." msgstr "" #. (para) @@ -4048,12 +4048,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4953 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4961 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." msgstr "" #. (para) @@ -4068,12 +4068,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4979 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4986 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." msgstr "" #. (para) @@ -4108,7 +4108,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5031 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." msgstr "" #. (title) @@ -4545,7 +4545,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5649 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." msgstr "" #. (para) @@ -4632,7 +4632,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5750 -msgid "View the Subversion properties for the selected item." +msgid "View the Git properties for the selected item." msgstr "" #. (para) @@ -4657,17 +4657,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5772 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5781 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5787 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "" #. (para) @@ -4702,7 +4702,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5842 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." msgstr "" #. (para) @@ -4742,7 +4742,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5876 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." msgstr "" #. (title) @@ -4777,7 +4777,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5917 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." msgstr "" #. (para) @@ -4787,7 +4787,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5936 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." msgstr "" #. (title) @@ -5041,7 +5041,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6249 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." msgstr "" #. (term) @@ -5436,7 +5436,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6693 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." msgstr "" #. (para) @@ -5501,7 +5501,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6795 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." msgstr "" #. (title) @@ -5511,7 +5511,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6809 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "" #. (title) @@ -5561,12 +5561,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6824 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6864 -msgid "Subversion uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." +msgid "Git uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." msgstr "" #. (para) @@ -5576,12 +5576,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6877 -msgid "Subversion uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." +msgid "Git uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6884 -msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Subversion compares them with the ignore pattern." +msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Git compares them with the ignore pattern." msgstr "" #. (para) @@ -5611,7 +5611,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6919 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " msgstr "" #. (title) @@ -5631,7 +5631,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6936 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "" #. (para) @@ -5641,7 +5641,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6960 -msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." msgstr "" #. (para) @@ -5651,12 +5651,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6988 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7002 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." msgstr "" #. (title) @@ -5750,12 +5750,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7131 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7137 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" msgstr "" #. (para) @@ -5807,7 +5807,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7193 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." msgstr "" #. (para) @@ -5837,12 +5837,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7225 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7233 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #. (title) @@ -5852,7 +5852,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7248 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." msgstr "" #. (para) @@ -5937,12 +5937,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7337 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7348 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." msgstr "" #. (title) @@ -5952,7 +5952,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7360 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." msgstr "" #. (title) @@ -5967,37 +5967,37 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:7376 -msgid "Explorer property page, Subversion tab" +msgid "Explorer property page, Git tab" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7374 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:7396 -msgid "Subversion Properties" +msgid "Git Properties" msgstr "" #. (primary) #: ../source/TortoiseGit_en.xml:7398 -msgid "Subversion properties" +msgid "Git properties" msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:7404 -msgid "Subversion property page" +msgid "Git property page" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7402 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7419 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." msgstr "" #. (title) @@ -6042,17 +6042,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7433 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7484 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7494 -msgid "For more information about properties in Subversion see the Special Properties." +msgid "For more information about properties in Git see the Special Properties." msgstr "" #. (title) @@ -6152,7 +6152,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7609 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." msgstr "" #. (title) @@ -6162,7 +6162,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7616 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." msgstr "" #. (title) @@ -6172,7 +6172,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7625 -msgid "You can configure Subversion to set properties automatically on files and folders when they are added to the repository. Read for further information." +msgid "You can configure Git to set properties automatically on files and folders when they are added to the repository. Read for further information." msgstr "" #. (title) @@ -6212,7 +6212,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7689 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files." msgstr "" #. (para) @@ -6299,7 +6299,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7818 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." msgstr "" #. (title) @@ -6331,7 +6331,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7861 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." msgstr "" #. (title) @@ -6473,7 +6473,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8048 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " msgstr "" #. (title) @@ -6499,7 +6499,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8102 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." msgstr "" #. (para) @@ -6529,7 +6529,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8145 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." msgstr "" #. (term) @@ -6541,12 +6541,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8156 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8165 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "" #. (para) @@ -6561,12 +6561,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8185 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8193 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." msgstr "" #. (title) @@ -6611,7 +6611,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8264 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." msgstr "" #. (para) @@ -6706,7 +6706,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8374 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" msgstr "" #. (para) @@ -6741,12 +6741,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8435 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8449 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "" #. (para) @@ -6761,7 +6761,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8471 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." msgstr "" #. (title) @@ -6796,7 +6796,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8485 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " msgstr "" #. (para) @@ -6806,7 +6806,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8525 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." msgstr "" #. (title) @@ -6901,17 +6901,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8622 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8646 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:8653 -msgid "How Locking Works in Subversion" +msgid "How Locking Works in Git" msgstr "" #. (para) @@ -6926,7 +6926,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8667 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." msgstr "" #. (para) @@ -6936,7 +6936,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8689 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." msgstr "" #. (para) @@ -7006,7 +7006,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8790 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." msgstr "" #. (title) @@ -7021,7 +7021,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8813 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." msgstr "" #. (title) @@ -7031,7 +7031,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8822 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." msgstr "" #. (para) @@ -7698,7 +7698,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9668 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." msgstr "" #. (para) @@ -7713,7 +7713,7 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:9697 -msgid "Exporting a Subversion Working Copy" +msgid "Exporting a Git Working Copy" msgstr "" #. (primary) @@ -7845,7 +7845,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9852 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." msgstr "" #. (para) @@ -7890,7 +7890,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9892 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." msgstr "" #. (para) @@ -8066,7 +8066,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10197 -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification." msgstr "" #. (title) @@ -8116,7 +8116,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10255 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." msgstr "" #. (para) @@ -8171,7 +8171,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10368 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." msgstr "" #. (term) @@ -8241,12 +8241,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10450 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10456 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." msgstr "" #. (para) @@ -8266,12 +8266,12 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:10492 -msgid "Subversion configuration file" +msgid "Git configuration file" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10494 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." msgstr "" #. (term) @@ -8281,12 +8281,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10521 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10528 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." msgstr "" #. (para) @@ -8386,7 +8386,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10651 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." msgstr "" #. (term) @@ -8756,12 +8756,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11065 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11070 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." msgstr "" #. (para) @@ -8855,7 +8855,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11172 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." msgstr "" #. (para) @@ -8885,7 +8885,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11217 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." msgstr "" #. (title) @@ -8969,7 +8969,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11332 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." msgstr "" #. (para) @@ -9135,7 +9135,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11565 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" msgstr "" #. (para) @@ -9375,7 +9375,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11806 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." msgstr "" #. (para) @@ -9455,7 +9455,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11877 -msgid "Called before the actual Subversion update begins." +msgid "Called before the actual Git update begins." msgstr "" #. (term) @@ -9562,7 +9562,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12049 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." msgstr "" #. (para) @@ -9652,7 +9652,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12142 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." msgstr "" #. (term) @@ -9707,7 +9707,7 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:12218 -msgid "Subversion Working Folders" +msgid "Git Working Folders" msgstr "" #. (primary) @@ -9722,7 +9722,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12225 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." msgstr "" #. (para) @@ -9732,7 +9732,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12236 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." msgstr "" #. (para) @@ -9787,7 +9787,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12297 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." msgstr "" #. (title) @@ -9797,7 +9797,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12312 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." msgstr "" #. (para) @@ -10232,7 +10232,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12635 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " msgstr "" #. (programlisting) @@ -10316,7 +10316,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12764 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." msgstr "" #. (para) @@ -10326,7 +10326,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12786 -msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." msgstr "" #. (title) @@ -10386,7 +10386,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12862 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." msgstr "" #. (title) @@ -10406,7 +10406,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12884 -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." msgstr "" #. (title) @@ -10553,7 +10553,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13085 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." msgstr "" #. (title) @@ -10618,7 +10618,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13179 -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." msgstr "" #. (para) @@ -10633,7 +10633,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13207 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" msgstr "" #. (para) @@ -11190,7 +11190,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13714 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." msgstr "" #. (title) @@ -11785,17 +11785,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14304 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14313 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14319 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." msgstr "" #. (title) @@ -11854,7 +11854,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14377 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." msgstr "" #. (para) @@ -11888,7 +11888,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14412 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." msgstr "" #. (screen) @@ -11907,7 +11907,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14422 #: ../source/TortoiseGit_en.xml:14510 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." msgstr "" #. (para) @@ -11927,7 +11927,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14437 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." msgstr "" #. (screen) @@ -12089,7 +12089,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14590 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." msgstr "" #. (screen) @@ -12221,7 +12221,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14692 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." msgstr "" #. (para) @@ -12319,7 +12319,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14780 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." msgstr "" #. (title) @@ -12339,7 +12339,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14809 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." msgstr "" #. (para) @@ -12364,12 +12364,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14851 -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14860 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." msgstr "" #. (para) @@ -12389,12 +12389,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14895 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14902 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "" #. (para) @@ -12439,22 +12439,22 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14972 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14982 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14987 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14993 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" msgstr "" #. (title) @@ -12472,7 +12472,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15014 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." msgstr "" #. (para) @@ -12608,7 +12608,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15177 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "" #. (para) @@ -12703,7 +12703,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15316 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "" #. (glossterm) @@ -12738,22 +12738,22 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15358 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bugfixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bugfixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15373 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15382 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15399 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "" #. (glossterm) @@ -12763,7 +12763,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15409 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "" #. (glossterm) @@ -12773,7 +12773,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15421 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "" #. (para) @@ -12798,7 +12798,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15464 -msgid "FS Filesystem. A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgid "FS Filesystem. A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "" #. (para) @@ -12818,7 +12818,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15489 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "" #. (para) @@ -12863,7 +12863,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15542 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "" #. (glossterm) @@ -12873,7 +12873,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15557 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "" #. (para) @@ -12903,7 +12903,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15612 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "" #. (glossterm) @@ -12938,12 +12938,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15653 -msgid "A frequently-used abbreviation for Subversion." +msgid "A frequently-used abbreviation for Git." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15656 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "" #. (para) @@ -12953,7 +12953,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15679 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "" #. (glossterm) diff --git a/doc/po/TortoiseSVN_fi.po b/doc/po/TortoiseSVN_fi.po index 26c747a..e88d55d 100644 --- a/doc/po/TortoiseSVN_fi.po +++ b/doc/po/TortoiseSVN_fi.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2009-02-04 22:58 +0000\n" "PO-Revision-Date: 2009-02-05 23:52+0200\n" "Last-Translator: Kari Granö \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,8 +41,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Subversion-käyttöliittymä Windows-ympäristöön" +msgid "A Git client for Windows" +msgstr "Git-käyttöliittymä Windows-ympäristöön" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -122,8 +122,8 @@ msgstr "Kohdeyleisö" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "Tämä kirja on tarkoitettu tietokoneita ymmärtäville ihmisille, jotka haluavat käyttää Subversion-ohjelmistoa tietojensa hallintaan, mutta eivät halua käyttää siihen komentoriviä. Koska TortoiseGit on Windows-komentotulkin laajennos, oletamme käyttäjän olevan sinut Windowsin Resurssienhallinnan kanssa ja osaavan käyttää sitä." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "Tämä kirja on tarkoitettu tietokoneita ymmärtäville ihmisille, jotka haluavat käyttää Git-ohjelmistoa tietojensa hallintaan, mutta eivät halua käyttää siihen komentoriviä. Koska TortoiseGit on Windows-komentotulkin laajennos, oletamme käyttäjän olevan sinut Windowsin Resurssienhallinnan kanssa ja osaavan käyttää sitä." #. (title) #: ../source/TortoiseGit_en.xml:84 @@ -142,18 +142,18 @@ msgstr " selvittää, mikä TortoiseGit on, #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." -msgstr "-luvussa käydään lyhyesti läpi Subversion-versionhallintajärjestelmä, joka on TortoiseGit-ohjelmiston perusta. Luku on lainaus Subversion-projektin käyttöohjeista; se hahmottaa erilaisia lähestymistapoja versionhallintaan ja selvittää Subversionin versiointiajattelua." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." +msgstr "-luvussa käydään lyhyesti läpi Git-versionhallintajärjestelmä, joka on TortoiseGit-ohjelmiston perusta. Luku on lainaus Git-projektin käyttöohjeista; se hahmottaa erilaisia lähestymistapoja versionhallintaan ja selvittää Gitin versiointiajattelua." #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." -msgstr "Useimpien Subversion-käyttäjien ei koskaan tarvitse asentaa palvelinta itse. Luku Palvelimen asennus selvittää, miten Subversion-palvelin asennetaan; siitä on eniten hyötyä ylläpitäjille." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgstr "Useimpien Git-käyttäjien ei koskaan tarvitse asentaa palvelinta itse. Luku Palvelimen asennus selvittää, miten Git-palvelin asennetaan; siitä on eniten hyötyä ylläpitäjille." #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr "Luku kuvaa, miten luodaan paikallinen arkisto, jolla on näppärää testata Subversion- ja TortoiseGit-ohjelmia omalla työasemalla. Se selittää myös hieman arkiston hallinnointia, ja on siltä osin hyödyksi myös palvelimella sijaitsevien arkistojen käsittelyssä." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr "Luku kuvaa, miten luodaan paikallinen arkisto, jolla on näppärää testata Git- ja TortoiseGit-ohjelmia omalla työasemalla. Se selittää myös hieman arkiston hallinnointia, ja on siltä osin hyödyksi myös palvelimella sijaitsevien arkistojen käsittelyssä." #. (para) #: ../source/TortoiseGit_en.xml:113 @@ -177,8 +177,8 @@ msgstr "Luku näyttää, miten TortoiseGit-i #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." -msgstr "Luku luettelee TortoiseGit-komentojen vastaavuudet Subversion -komentorivitulkin svn.exe kanssa." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." +msgstr "Luku luettelee TortoiseGit-komentojen vastaavuudet Git -komentorivitulkin svn.exe kanssa." #. (title) #: ../source/TortoiseGit_en.xml:144 @@ -202,8 +202,8 @@ msgstr "Yhteisö" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "Sekä TortoiseGit että Subversion -ohjelmia kehittää yhteisö, jonka jäsenet työskentelevät näitten projektien parissa. Kehittäjät ovat eri maista ympäri maailmaa ja tekevät yhteistyötä saadakseen aikaan parempia ohjelmia." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "Sekä TortoiseGit että Git -ohjelmia kehittää yhteisö, jonka jäsenet työskentelevät näitten projektien parissa. Kehittäjät ovat eri maista ympäri maailmaa ja tekevät yhteistyötä saadakseen aikaan parempia ohjelmia." #. (title) #: ../source/TortoiseGit_en.xml:180 @@ -252,13 +252,13 @@ msgstr "avusta käyttöohjeiden teossa ja virheiden etsinnässä" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "Subversion-kirjalle" +msgid "The Git Book" +msgstr "Git-kirjalle" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "hienosta johdannosta Subversion-ohjelmaan ja sen luvusta 2, jonka kopioimme tänne" +msgid "for the great introduction to Git and its chapter 2 which we copied here" +msgstr "hienosta johdannosta Git-ohjelmaan ja sen luvusta 2, jonka kopioimme tänne" #. (term) #: ../source/TortoiseGit_en.xml:225 @@ -371,13 +371,13 @@ msgstr "Mikä TortoiseGit on?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." -msgstr "TortoiseGit on ilmainen avoimeen lähdekoodiin perustuva asiakassovellus Subversion-versionhallintajärjestelmälle. Toisin ilmaistuna TortoiseGit pitää kirjaa tiedostoihin ja hakemistoihin ajan mittaan tehdyistä muutoksista. Tiedostot talletetaan keskitettyyn arkistoon. Arkisto muistuttaa paljolti tiedostopalvelinta, mutta sen lisäksi se muistaa kaikki tiedostoihin ja hakemistoihin koskaan tehdyt muutokset. Tämän ansiosta voit palauttaa vanhoja versioita tiedostoistasi ja verrata sitä, miten ja milloin tiedot ovat muuttuneet, ja kenen toimesta. Tästä syystä Subversionia (ja versionhallintajärjestelmiä yleensä) voidaan pitää eräänlaisena aikakoneena." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." +msgstr "TortoiseGit on ilmainen avoimeen lähdekoodiin perustuva asiakassovellus Git-versionhallintajärjestelmälle. Toisin ilmaistuna TortoiseGit pitää kirjaa tiedostoihin ja hakemistoihin ajan mittaan tehdyistä muutoksista. Tiedostot talletetaan keskitettyyn arkistoon. Arkisto muistuttaa paljolti tiedostopalvelinta, mutta sen lisäksi se muistaa kaikki tiedostoihin ja hakemistoihin koskaan tehdyt muutokset. Tämän ansiosta voit palauttaa vanhoja versioita tiedostoistasi ja verrata sitä, miten ja milloin tiedot ovat muuttuneet, ja kenen toimesta. Tästä syystä Gitia (ja versionhallintajärjestelmiä yleensä) voidaan pitää eräänlaisena aikakoneena." #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." -msgstr "Jotkut versionhallintajärjestelmät ovat myös lähdekoodin konfigurointijärjestelmiä (software configuration management, SCM). Tällaiset järjestelmät on erityisesti räätälöity lähdekoodipuiden hallintaan, ja niillä on monia ohjelmistonkehitykseen liittyviä erityisominaisuuksia (esim. tuki ohjelmointikielten syntaksille tai työkaluja ohjelmistojen rakentamiseen). Subversion ei kuitenkaan ole tällainen: se on yleinen järjestelmä, jota voidaan käyttää minkä tahansa tiedostokokoelman hallintaan (mukaan lukien lähdekooditiedostot)." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgstr "Jotkut versionhallintajärjestelmät ovat myös lähdekoodin konfigurointijärjestelmiä (software configuration management, SCM). Tällaiset järjestelmät on erityisesti räätälöity lähdekoodipuiden hallintaan, ja niillä on monia ohjelmistonkehitykseen liittyviä erityisominaisuuksia (esim. tuki ohjelmointikielten syntaksille tai työkaluja ohjelmistojen rakentamiseen). Git ei kuitenkaan ole tällainen: se on yleinen järjestelmä, jota voidaan käyttää minkä tahansa tiedostokokoelman hallintaan (mukaan lukien lähdekooditiedostot)." #. (title) #: ../source/TortoiseGit_en.xml:368 @@ -386,18 +386,18 @@ msgstr "TortoiseGit-ohjelman historia" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "Vuonna 2002 Tim Kemp keksi, että Subversion on erittäin hyvä versionhallintajärjestelmä, mutta ilman graafista käyttöliittymää. Ajatus Subversion-asiakasohjelmasta Windowsin Resurssienhallinnan laajennoksena sai alkunsa saman tyyppisestä CVS-asiakasohjelmasta nimeltä TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "Vuonna 2002 Tim Kemp keksi, että Git on erittäin hyvä versionhallintajärjestelmä, mutta ilman graafista käyttöliittymää. Ajatus Git-asiakasohjelmasta Windowsin Resurssienhallinnan laajennoksena sai alkunsa saman tyyppisestä CVS-asiakasohjelmasta nimeltä TortoiseCVS." #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Tim tutki TortoiseCVS-lähdekoodia ja käytti sitä TortoiseGit-ohjelman pohjana. Sitten hän käynnisti projektin, rekisteröi nimialueen TortoiseGit.org ja julkaisi lähdekoodin. Samoihin aikoihin Stefan Küng etsiskeli hyvää ja ilmaista versionhallintajärjestelmää ja törmäsi Subversioniin sekä TortoiseGit-lähdekoodeihin. Koska TortoiseGit ei ollut vielä käyttövalmis, hän liittyi projektiin ja alkoi kehittää sitä. Pian hän kirjoitti suurimman osan olemassa olevasta koodista uudelleen ja alkoi lisätä ominaisuuksia siinä laajuudessa, että ennen pitkää alkuperäisestä koodista ei ollut mitään jäljellä." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Tim tutki TortoiseCVS-lähdekoodia ja käytti sitä TortoiseGit-ohjelman pohjana. Sitten hän käynnisti projektin, rekisteröi nimialueen TortoiseGit.org ja julkaisi lähdekoodin. Samoihin aikoihin Stefan Küng etsiskeli hyvää ja ilmaista versionhallintajärjestelmää ja törmäsi Gitiin sekä TortoiseGit-lähdekoodeihin. Koska TortoiseGit ei ollut vielä käyttövalmis, hän liittyi projektiin ja alkoi kehittää sitä. Pian hän kirjoitti suurimman osan olemassa olevasta koodista uudelleen ja alkoi lisätä ominaisuuksia siinä laajuudessa, että ennen pitkää alkuperäisestä koodista ei ollut mitään jäljellä." #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." -msgstr "Subversionin tullessa vakaammaksi se alkoi kiinnostaa yhä useampia käyttäjiä, jotka myös ryhtyivät käyttämään TortoiseGit-ohjelmaa asiakasohjelmanaan. Käyttäjien joukko kasvoi voimakkaasti (ja kasvaa yhä päivittäin). Tässä vaiheessa Lübbe Onken tarjoutui auttamaan kuvakkeiden ja TortoiseGit-logon suunnittelussa. Hän huolehtii verkkosivustosta ja koordinoi käännöksiä eri kielille." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgstr "Gitin tullessa vakaammaksi se alkoi kiinnostaa yhä useampia käyttäjiä, jotka myös ryhtyivät käyttämään TortoiseGit-ohjelmaa asiakasohjelmanaan. Käyttäjien joukko kasvoi voimakkaasti (ja kasvaa yhä päivittäin). Tässä vaiheessa Lübbe Onken tarjoutui auttamaan kuvakkeiden ja TortoiseGit-logon suunnittelussa. Hän huolehtii verkkosivustosta ja koordinoi käännöksiä eri kielille." #. (title) #: ../source/TortoiseGit_en.xml:399 @@ -406,8 +406,8 @@ msgstr "TortoiseGit-ohjelman ominaisuudet" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." -msgstr "Mikä tekee TortoiseGit-ohjelmasta niin hyvän Subversion-asiakkaan? Tässä on lyhyt lista ominaisuuksista." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." +msgstr "Mikä tekee TortoiseGit-ohjelmasta niin hyvän Git-asiakkaan? Tässä on lyhyt lista ominaisuuksista." #. (term) #: ../source/TortoiseGit_en.xml:406 @@ -446,18 +446,18 @@ msgstr "Versioitujen tiedostojen ja kansioiden tila ilmaistaan pienillä kuvakep #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Helposti saatavilla olevat Subversion-komennot" +msgid "Easy access to Git commands" +msgstr "Helposti saatavilla olevat Git-komennot" #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." -msgstr "Kaikki Subversion-komennot ovat käytettävissä Resurssienhallinnan kontekstivalikosta. TortoiseGit lisää sinne oman alivalikkonsa." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgstr "Kaikki Git-komennot ovat käytettävissä Resurssienhallinnan kontekstivalikosta. TortoiseGit lisää sinne oman alivalikkonsa." #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "Koska TortoiseGit on Subversion-asiakas, on syytä luetella myös Subversionin ominaisuudet:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" +msgstr "Koska TortoiseGit on Git-asiakas, on syytä luetella myös Gitin ominaisuudet:" #. (term) #: ../source/TortoiseGit_en.xml:460 @@ -466,8 +466,8 @@ msgstr "Versioituvat hakemistot" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS tallettaa vain yksittäisten tiedostojen muutoshistorian, mutta Subversion toteuttaa virtuaalisen versioidun tiedostojärjestelmän, joka tallettaa koko kansiopuun muutokset ajan kuluessa. Sekä tiedostot että kansiot versioidaan. Tästä johtuen on olemassa erilliset asiakaspään komennot siirrä ja kopioi, jotka toimivat tiedostojen ja kansioiden kanssa." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS tallettaa vain yksittäisten tiedostojen muutoshistorian, mutta Git toteuttaa virtuaalisen versioidun tiedostojärjestelmän, joka tallettaa koko kansiopuun muutokset ajan kuluessa. Sekä tiedostot että kansiot versioidaan. Tästä johtuen on olemassa erilliset asiakaspään komennot siirrä ja kopioi, jotka toimivat tiedostojen ja kansioiden kanssa." #. (term) #: ../source/TortoiseGit_en.xml:475 @@ -496,8 +496,8 @@ msgstr "Useita verkkokerroksia arkistoon kytkeytymiseksi" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "Subversion-järjestelmässä arkistoon kytkeytyminen on irrotettu omaksi rajapinnakseen, mikä helpottaa uusien kytkeytymistapojen kehittämistä. Subversionin monipuolisin palvelinvaihtoehto on toteutettu Apache-verkkopalvelimen modulina, joka ymmärtää HTTP-protokollan WebDAV/DeltaV -nimistä muunnelmaa. Tämä tekee Subversionista vakaamman ja parantaa sen yhteiskäytettävyyttä, sekä tarjoaa myös useita keskeisiä ominaisuuksia ilmaiseksi (esim. tunnistaminen, valtuuttaminen, pakkaus ja arkiston selaus). Subversion-palvelimesta on tarjolla myös kevyempi, itsenäisesti toimiva vaihtoehto. Tämä vaihtoehto noudattaa omaa yhteyskäytäntöään, joka voidaan helposti tunneloida ssh-yhteyden yli." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "Git-järjestelmässä arkistoon kytkeytyminen on irrotettu omaksi rajapinnakseen, mikä helpottaa uusien kytkeytymistapojen kehittämistä. Gitin monipuolisin palvelinvaihtoehto on toteutettu Apache-verkkopalvelimen modulina, joka ymmärtää HTTP-protokollan WebDAV/DeltaV -nimistä muunnelmaa. Tämä tekee Gitista vakaamman ja parantaa sen yhteiskäytettävyyttä, sekä tarjoaa myös useita keskeisiä ominaisuuksia ilmaiseksi (esim. tunnistaminen, valtuuttaminen, pakkaus ja arkiston selaus). Git-palvelimesta on tarjolla myös kevyempi, itsenäisesti toimiva vaihtoehto. Tämä vaihtoehto noudattaa omaa yhteyskäytäntöään, joka voidaan helposti tunneloida ssh-yhteyden yli." #. (term) #: ../source/TortoiseGit_en.xml:516 @@ -506,8 +506,8 @@ msgstr "Johdonmukainen tiedonkäsittely" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." -msgstr "Subversion esittää tiedostojen eroavuudet käyttäen binääristä erottelualgoritmia, joka toimii identtisesti sekä tekstiä (ihmisen luettavissa) että binääristä dataa (ei ihmisen luettavissa) sisältäville tiedostoille. Molemmat tiedostotyypit tallennetaan samaan tapaan pakattuina arkistossa, ja vain erot siirretään kumpaankin suuntaan verkkoyhteyksien ylitse." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgstr "Git esittää tiedostojen eroavuudet käyttäen binääristä erottelualgoritmia, joka toimii identtisesti sekä tekstiä (ihmisen luettavissa) että binääristä dataa (ei ihmisen luettavissa) sisältäville tiedostoille. Molemmat tiedostotyypit tallennetaan samaan tapaan pakattuina arkistossa, ja vain erot siirretään kumpaankin suuntaan verkkoyhteyksien ylitse." #. (term) #: ../source/TortoiseGit_en.xml:529 @@ -516,8 +516,8 @@ msgstr "Tehokas haarautuminen ja merkintöjen teko" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." -msgstr "Haarojen luonnin (branching) ja versioiden merkitsemisen (tagging) kustannusten ei tarvitse olla suhteessa projektin kokoon. Subversion luo haarat ja merkit yksinkertaisesti kopioimalla projektin linkittämällä. Tästä johtuen nämä toiminnot vievät vain vähän aikaa (vakioajan) ja varaavat vain vähän tilaa arkistosta." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgstr "Haarojen luonnin (branching) ja versioiden merkitsemisen (tagging) kustannusten ei tarvitse olla suhteessa projektin kokoon. Git luo haarat ja merkit yksinkertaisesti kopioimalla projektin linkittämällä. Tästä johtuen nämä toiminnot vievät vain vähän aikaa (vakioajan) ja varaavat vain vähän tilaa arkistosta." #. (term) #: ../source/TortoiseGit_en.xml:542 @@ -526,8 +526,8 @@ msgstr "Muunneltavuus" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Subversionilla ei ole historian painolastia (vrt. CVS); se on toteutettu joukkona jaettuja C-kirjastoja, joilla on selkeät ohjelmointirajapinnat. Tämä tekee Subversionista erittäin ylläpidettävän ja käyttökelpoisen muille sovelluksille ja kielille." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." +msgstr "Gitilla ei ole historian painolastia (vrt. CVS); se on toteutettu joukkona jaettuja C-kirjastoja, joilla on selkeät ohjelmointirajapinnat. Tämä tekee Gitista erittäin ylläpidettävän ja käyttökelpoisen muille sovelluksille ja kielille." #. (title) #: ../source/TortoiseGit_en.xml:558 @@ -671,23 +671,23 @@ msgstr "Peruskäsitteitä" #. (primary) #: ../source/TortoiseGit_en.xml:725 -msgid "Subversion book" -msgstr "Subversion-kirja" +msgid "Git book" +msgstr "Git-kirja" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." -msgstr "Tämä luku on hieman muunneltu versio samasta luvusta Subversion-kirjassa. Elektroninen versio Subversion-kirjasta on saatavilla osoitteesta http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." +msgstr "Tämä luku on hieman muunneltu versio samasta luvusta Git-kirjassa. Elektroninen versio Git-kirjasta on saatavilla osoitteesta http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." -msgstr "Tämä luku sisältää lyhyen Subversion-ohjelman esittelyn. Jos et ole aiemmin käyttänyt versionhallintaa, tämä luku on sinua varten. Aloitamme puhumalla versionhallinnan käsitteistä yleisesti, jatkamme siitä Subversionin keskeisiin ideoihin ja esitämme muutamia yksinkertaisia käyttöesimerkkejä." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." +msgstr "Tämä luku sisältää lyhyen Git-ohjelman esittelyn. Jos et ole aiemmin käyttänyt versionhallintaa, tämä luku on sinua varten. Aloitamme puhumalla versionhallinnan käsitteistä yleisesti, jatkamme siitä Gitin keskeisiin ideoihin ja esitämme muutamia yksinkertaisia käyttöesimerkkejä." #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." -msgstr "Vaikka tämän luvun esimerkit kuvaavat ihmisiä, jotka työskentelevät ohjelmakoodin parissa, kannattaa muistaa, että Subversion osaa käsitellä mielivaltaisia tiedostojoukkoja - se ei ole rajoittunut pelkästään auttamaan ohjelmoijia." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." +msgstr "Vaikka tämän luvun esimerkit kuvaavat ihmisiä, jotka työskentelevät ohjelmakoodin parissa, kannattaa muistaa, että Git osaa käsitellä mielivaltaisia tiedostojoukkoja - se ei ole rajoittunut pelkästään auttamaan ohjelmoijia." #. (title) #. (title) @@ -707,8 +707,8 @@ msgstr "arkisto" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." -msgstr "Subversion on keskitetty järjestelmä tiedon jakamiseen. Sen ytimessä on arkisto, jonne tiedot talletetaan. Arkisto muodostaa tiedostopuun, joka on tyypillisesti hierarkkinen kokoelma tiedostoja ja kansioita. Arkistoon voi kytkeytyä mielivaltainen määrä asiakkaita, jotka lukevat ja kirjoittavat näihin tiedostoja. Kirjoittamalla tietoa asiakas asettaa sen muiden saataville; lukemalla asiakas saa tietoa muilta." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgstr "Git on keskitetty järjestelmä tiedon jakamiseen. Sen ytimessä on arkisto, jonne tiedot talletetaan. Arkisto muodostaa tiedostopuun, joka on tyypillisesti hierarkkinen kokoelma tiedostoja ja kansioita. Arkistoon voi kytkeytyä mielivaltainen määrä asiakkaita, jotka lukevat ja kirjoittavat näihin tiedostoja. Kirjoittamalla tietoa asiakas asettaa sen muiden saataville; lukemalla asiakas saa tietoa muilta." #. (title) #: ../source/TortoiseGit_en.xml:767 @@ -717,8 +717,8 @@ msgstr "Tyypillinen asiakas/palvelin -järjestelmä" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." -msgstr "Miksi tämä on kiinnostavaa? Tähän saakka kuvaus kuulostaa tyypilliseltä tiedostopalvelimen määritelmältä. Arkisto on tosiaan eräänlainen tiedostopalvelin, mutta ei tavallinen sellainen. Subversion-arkisto on erityinen siinä, että se muistaa jokaisen muutoksen joka on koskaan kirjoitettu siihen: jokaisen muutoksen jokaiseen tiedostoon, ja jopa muutokset itse kansiorakenteeseen - esimerkiksi kansioiden lisäykset, poistot ja uudelleenjärjestelyt." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgstr "Miksi tämä on kiinnostavaa? Tähän saakka kuvaus kuulostaa tyypilliseltä tiedostopalvelimen määritelmältä. Arkisto on tosiaan eräänlainen tiedostopalvelin, mutta ei tavallinen sellainen. Git-arkisto on erityinen siinä, että se muistaa jokaisen muutoksen joka on koskaan kirjoitettu siihen: jokaisen muutoksen jokaiseen tiedostoon, ja jopa muutokset itse kansiorakenteeseen - esimerkiksi kansioiden lisäykset, poistot ja uudelleenjärjestelyt." #. (para) #: ../source/TortoiseGit_en.xml:780 @@ -791,8 +791,8 @@ msgstr "Kopioi-muokkaa-yhdistä -ratkaisu" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." -msgstr "Subversion, CVS ja monet muut versionhallintajärjestelmät käyttävät kopioi-muokkaa-yhdistä -mallia vaihtoehtona lukitukselle. Tässä mallissa kunkin käyttäjän asiakasohjelma lukee arkistoa ja muodostaa henkilökohtaisen työkopion projektista. Käyttäjät työskentelevät sitten yhtä aikaa, kukin muokaten omia kopioitaan. Lopulta omat kopiot yhdistetään uudeksi, lopulliseksi versioksi. Versionhallintajärjestelmä auttaa usein yhdistämisessä, mutta loppujen lopuksi käyttäjä (ihminen) on vastuussa siitä, että yhdistäminen tapahtuu oikein." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgstr "Git, CVS ja monet muut versionhallintajärjestelmät käyttävät kopioi-muokkaa-yhdistä -mallia vaihtoehtona lukitukselle. Tässä mallissa kunkin käyttäjän asiakasohjelma lukee arkistoa ja muodostaa henkilökohtaisen työkopion projektista. Käyttäjät työskentelevät sitten yhtä aikaa, kukin muokaten omia kopioitaan. Lopulta omat kopiot yhdistetään uudeksi, lopulliseksi versioksi. Versionhallintajärjestelmä auttaa usein yhdistämisessä, mutta loppujen lopuksi käyttäjä (ihminen) on vastuussa siitä, että yhdistäminen tapahtuu oikein." #. (para) #: ../source/TortoiseGit_en.xml:907 @@ -833,18 +833,18 @@ msgstr "On eräs tavallinen tilanne, jossa lukitse-muokkaa-vapauta -malli toimii #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" -msgstr "Mitä Subversion tekee?" +msgid "What does Git Do?" +msgstr "Mitä Git tekee?" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." -msgstr "Subversion käyttää oletusarvoisesti kopioi-muokkaa-yhdistä -mallia, ja useissa tapauksissa et koskaan tarvitse mitään muuta. Versiosta 1.2 alkaen Subversion tukee kuitenkin myös tiedostojen lukitusta, joten jos projektissasi on tiedostoja, joita ei voi yhdistää (tai projektikäytäntö edellyttää lukitusmallin käyttöä), Subversion tarjoaa silti tarvittavat ominaisuudet." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." +msgstr "Git käyttää oletusarvoisesti kopioi-muokkaa-yhdistä -mallia, ja useissa tapauksissa et koskaan tarvitse mitään muuta. Versiosta 1.2 alkaen Git tukee kuitenkin myös tiedostojen lukitusta, joten jos projektissasi on tiedostoja, joita ei voi yhdistää (tai projektikäytäntö edellyttää lukitusmallin käyttöä), Git tarjoaa silti tarvittavat ominaisuudet." #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" -msgstr "Subversion toiminnassa" +msgid "Git in Action" +msgstr "Git toiminnassa" #. (title) #: ../source/TortoiseGit_en.xml:991 @@ -858,28 +858,28 @@ msgstr "työkopio" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." -msgstr "Olet jo lukenut työkopioista; nyt näytämme, kuinka Subversion-asiakasohjelma luo ja käyttää niitä." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." +msgstr "Olet jo lukenut työkopioista; nyt näytämme, kuinka Git-asiakasohjelma luo ja käyttää niitä." #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." -msgstr "Subversion-työkopio on tietokoneellasi sijaitseva tavallinen kansiopuu, joka sisältää kokoelman tiedostoja. Voit muokata näitä tiedostoja mielesi mukaan, ja mikäli ne ovat lähdekooditiedostoja, voit kääntää ne ohjelmaksi tavanomaiseen tapaan. Työkopiosi on yksityistä työaluettasi: Subversion ei koskaan lisää siihen muiden tekemiä muutoksia, eikä myöskään siirrä omia muutoksiasi muitten saataville ennen kuin erikseen komennat sitä tekemään niin. " +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgstr "Git-työkopio on tietokoneellasi sijaitseva tavallinen kansiopuu, joka sisältää kokoelman tiedostoja. Voit muokata näitä tiedostoja mielesi mukaan, ja mikäli ne ovat lähdekooditiedostoja, voit kääntää ne ohjelmaksi tavanomaiseen tapaan. Työkopiosi on yksityistä työaluettasi: Git ei koskaan lisää siihen muiden tekemiä muutoksia, eikä myöskään siirrä omia muutoksiasi muitten saataville ennen kuin erikseen komennat sitä tekemään niin. " #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." -msgstr "Tehtyäsi muutoksia työkopiossasi oleviin tiedostoihin ja varmistuttuasi, että ne toimivat moitteetta, voit Subversionin komennoilla julkaista muutoksesi muille projektissasi työskenteleville ihmisille (kirjoittamalla arkistoon). Jos muut ihmiset julkaisevat omia muutoksiaan, voit yhdistää ne työkopioosi Subversionin komennoilla (lukemalla arkistosta)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgstr "Tehtyäsi muutoksia työkopiossasi oleviin tiedostoihin ja varmistuttuasi, että ne toimivat moitteetta, voit Gitin komennoilla julkaista muutoksesi muille projektissasi työskenteleville ihmisille (kirjoittamalla arkistoon). Jos muut ihmiset julkaisevat omia muutoksiaan, voit yhdistää ne työkopioosi Gitin komennoilla (lukemalla arkistosta)." #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." -msgstr "Työkopio sisältää myös muutamia ylimääräisiä tiedostoja, jotka Subversion luo ja pitää yllä voidakseen suorittaa komentojaan. Erityisesti, jokainen työkopiosi hakemisto sisältää alihakemiston nimeltä .svn, jota nimitetään myös työkopion hallintohakemistoksi. Kunkin hallintohakemiston tiedostot auttavat Subversionia havaitsemaan, mitkä tiedostot sisältävät julkaisemattomia muutoksia, ja mitkä tiedostot ovat vanhentuneita suhteessa muiden tekemiin muutoksiin." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgstr "Työkopio sisältää myös muutamia ylimääräisiä tiedostoja, jotka Git luo ja pitää yllä voidakseen suorittaa komentojaan. Erityisesti, jokainen työkopiosi hakemisto sisältää alihakemiston nimeltä .svn, jota nimitetään myös työkopion hallintohakemistoksi. Kunkin hallintohakemiston tiedostot auttavat Gitia havaitsemaan, mitkä tiedostot sisältävät julkaisemattomia muutoksia, ja mitkä tiedostot ovat vanhentuneita suhteessa muiden tekemiin muutoksiin." #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." -msgstr "Tyypillinen Subversion-arkisto sisältää usein useiden projektien tiedostot (tai lähdekoodin); tavallisesti kukin projekti on alihakemisto arkiston tiedostopuussa. Tällaisessa järjestelyssä käyttäjän työkopio vastaa yleensä yhtä arkiston alipuuta." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgstr "Tyypillinen Git-arkisto sisältää usein useiden projektien tiedostot (tai lähdekoodin); tavallisesti kukin projekti on alihakemisto arkiston tiedostopuussa. Tällaisessa järjestelyssä käyttäjän työkopio vastaa yleensä yhtä arkiston alipuuta." #. (para) #: ../source/TortoiseGit_en.xml:1038 @@ -903,13 +903,13 @@ msgstr "Saadaksesi työkopion, sinun täytyy hakea työkopiobutton.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." -msgstr "Oletetaan, että teet muutoksia tiedostoon button.c. Koska .svn -hakemisto muistaa tiedoston muutospäivämäärän ja alkuperäisen sisällön, Subversion tietää, että olet muuttanut tiedostoa. Subversion ei kuitenkaan julkaise muutoksiasi ennen kuin erikseen komennat sitä. Muutosten julkaisutoimentpidettä kutsutaan yleisemmin arkistoon toimittamiseksi (engl. commit)." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgstr "Oletetaan, että teet muutoksia tiedostoon button.c. Koska .svn -hakemisto muistaa tiedoston muutospäivämäärän ja alkuperäisen sisällön, Git tietää, että olet muuttanut tiedostoa. Git ei kuitenkaan julkaise muutoksiasi ennen kuin erikseen komennat sitä. Muutosten julkaisutoimentpidettä kutsutaan yleisemmin arkistoon toimittamiseksi (engl. commit)." #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." -msgstr "Julkaistaksesi muutoksesi muille, voit käyttää Subversion-komentoa toimita arkistoon." +msgid "To publish your changes to others, you can use Git's commit command." +msgstr "Julkaistaksesi muutoksesi muille, voit käyttää Git-komentoa toimita arkistoon." #. (para) #: ../source/TortoiseGit_en.xml:1072 @@ -918,18 +918,18 @@ msgstr "Nyt muutoksesi tiedostoon button.c on toimitettu a #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." -msgstr "Oletetaan, että sinulla on työtoveri Sally, joka nouti työkopion projektista /calc samaan aikaan sinun kanssasi. Kun toimitat muutoksesi tiedostoon button.c, Sallyn työkopio säilyy muuttumattomana; Subversion muokkaa työkopioita vain käyttäjän niin pyytäessä." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." +msgstr "Oletetaan, että sinulla on työtoveri Sally, joka nouti työkopion projektista /calc samaan aikaan sinun kanssasi. Kun toimitat muutoksesi tiedostoon button.c, Sallyn työkopio säilyy muuttumattomana; Git muokkaa työkopioita vain käyttäjän niin pyytäessä." #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." -msgstr "Saattaakseen projektinsa ajan tasalle, Sally voi pyytää Subversionia päivittämään työkopionsa käyttäen komentoa päivitä. Tämä liittää muutoksesi Sallyn työkopioon, samoin kuin kaikki muutkin arkistoon edellisen työkopion noudon jälkeen tapahtuneet muutokset." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgstr "Saattaakseen projektinsa ajan tasalle, Sally voi pyytää Gitia päivittämään työkopionsa käyttäen komentoa päivitä. Tämä liittää muutoksesi Sallyn työkopioon, samoin kuin kaikki muutkin arkistoon edellisen työkopion noudon jälkeen tapahtuneet muutokset." #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." -msgstr "Huomaa, ettei Sallyn ei tarvinnut kertoa, mitä tiedostoja päivitetään; Subversion käyttää arkiston lisäksi .svn -hakemistojen tietoja päättääksen, mitkä tiedostot pitää saattaa ajan tasalle." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgstr "Huomaa, ettei Sallyn ei tarvinnut kertoa, mitä tiedostoja päivitetään; Git käyttää arkiston lisäksi .svn -hakemistojen tietoja päättääksen, mitkä tiedostot pitää saattaa ajan tasalle." #. (title) #: ../source/TortoiseGit_en.xml:1103 @@ -938,8 +938,8 @@ msgstr "Arkistopaikantimet" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" -msgstr "Subversion-arkistoihin voi päästä käsiksi useilla eri tavoilla - suoraan paikalliselta levyltä tai erilaisten yhteyskäytäntöjen kautta. Arkiston paikka ilmaistaan kuitenkin aina paikantimella (Uniform Resource Locator, URL). Paikantimesta käy ilmi, miten arkistoon kytkeydytään: " +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgstr "Git-arkistoihin voi päästä käsiksi useilla eri tavoilla - suoraan paikalliselta levyltä tai erilaisten yhteyskäytäntöjen kautta. Arkiston paikka ilmaistaan kuitenkin aina paikantimella (Uniform Resource Locator, URL). Paikantimesta käy ilmi, miten arkistoon kytkeydytään: " #. (title) #: ../source/TortoiseGit_en.xml:1112 @@ -975,8 +975,8 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "Kytkeytyminen WebDAV-käytännöllä Subversion-tietoiseen Apache-palvelimeen." +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "Kytkeytyminen WebDAV-käytännöllä Git-tietoiseen Apache-palvelimeen." #. (literal) #: ../source/TortoiseGit_en.xml:1141 @@ -1021,8 +1021,8 @@ msgstr "Salattu TCP/IP-pohjainen kytkeytyminen -palvelimeen tunn #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." -msgstr "Subversion-paikantimet käyttävät enimmäkseen normaalia syntaksia, joka sallii palvelimen nimen ja porttinumeron liittämisen osaksi paikanninta. Kytkeytymistapaa file:// käytetään yleensä paikallisesti, vaikka sitä voidaan käyttää myös verkkopalvelimen UNC-polkujen kanssa. Paikannin on siten muotoa file://konenimi/polku/arkistoon. Paikallisessa tietokoneessa paikantimen konenimiosan pitää joko puuttua tai olla localhost. Tästä syystä paikalliset polut sisältävät yleensä kolme kauttaviivaa, file:///polku/arkistoon." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgstr "Git-paikantimet käyttävät enimmäkseen normaalia syntaksia, joka sallii palvelimen nimen ja porttinumeron liittämisen osaksi paikanninta. Kytkeytymistapaa file:// käytetään yleensä paikallisesti, vaikka sitä voidaan käyttää myös verkkopalvelimen UNC-polkujen kanssa. Paikannin on siten muotoa file://konenimi/polku/arkistoon. Paikallisessa tietokoneessa paikantimen konenimiosan pitää joko puuttua tai olla localhost. Tästä syystä paikalliset polut sisältävät yleensä kolme kauttaviivaa, file:///polku/arkistoon." #. (para) #: ../source/TortoiseGit_en.xml:1181 @@ -1081,8 +1081,8 @@ msgstr "Toiminto svn commit julkaisee yhteen tai useampaan ti #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." -msgstr "Arkistossa kutakin toimitusta kohdellaan atomisena: joka kaikki toimituksen muutokset tulevat voimaan, tai mikään niistä ei tule voimaan. Subversion koettaa säilyttää tämän atomisuuden ohjelmien kaatuessa, järjestelmien kaatuessa, verkkoyhteyksien katkeillessa ja muiden käyttäjien toimien keskellä." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgstr "Arkistossa kutakin toimitusta kohdellaan atomisena: joka kaikki toimituksen muutokset tulevat voimaan, tai mikään niistä ei tule voimaan. Git koettaa säilyttää tämän atomisuuden ohjelmien kaatuessa, järjestelmien kaatuessa, verkkoyhteyksien katkeillessa ja muiden käyttäjien toimien keskellä." #. (para) #: ../source/TortoiseGit_en.xml:1238 @@ -1101,8 +1101,8 @@ msgstr "Globaalit versionumerot" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" -msgstr "Toisin kuin monissa muissa versionhallintajärjestelmissä, Subversionin versionumerot kuvaavat kokonaisia puita, eivät yksittäisiä tiedostoja. Kukin versionumero määrittää kokonaisen puun, tietyn arkiston tilan jonkin toimitetun muutoksen jälkeen. Toinen tapa ajatella asiaa on, että versio N kuvaa arkiston tilan N:nnen toimituksen jälkeen. Kun Subversion-käyttäjät puhuvat ``tiedoston foo.c versiosta 5'', he tarkoittavat oikeasti ``tiedostoa foo.c sellaisena kun se esiintyy versiossa 5.'' Huomaa, että yleisesti ottaen jonkun tiedoston versiot N ja M eivät välttämättä poikkea toisistaan!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgstr "Toisin kuin monissa muissa versionhallintajärjestelmissä, Gitin versionumerot kuvaavat kokonaisia puita, eivät yksittäisiä tiedostoja. Kukin versionumero määrittää kokonaisen puun, tietyn arkiston tilan jonkin toimitetun muutoksen jälkeen. Toinen tapa ajatella asiaa on, että versio N kuvaa arkiston tilan N:nnen toimituksen jälkeen. Kun Git-käyttäjät puhuvat ``tiedoston foo.c versiosta 5'', he tarkoittavat oikeasti ``tiedostoa foo.c sellaisena kun se esiintyy versiossa 5.'' Huomaa, että yleisesti ottaen jonkun tiedoston versiot N ja M eivät välttämättä poikkea toisistaan!" #. (para) #: ../source/TortoiseGit_en.xml:1276 @@ -1163,8 +1163,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." -msgstr "Sallyn tiedostoon integer.c tekemät muutokset ilmestyvät työkopioosi, ja oma muutoksesi on yhä mukana tiedostossa button.c. Tässä esimerkissä tiedoston Makefile sisältö on identtinen versioissa 4, 5, ja 6, mutta Subversion merkitsee työkopiosi tiedoston Makefile versiolla 6 ilmaisemaan, että se on yhä ajan tasalla. Tehtyäsi päivityksen työkopiosi juurihakemistolle se vastaa yleisesti ottaen täsmälleen yhtä arkiston versiota." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgstr "Sallyn tiedostoon integer.c tekemät muutokset ilmestyvät työkopioosi, ja oma muutoksesi on yhä mukana tiedostossa button.c. Tässä esimerkissä tiedoston Makefile sisältö on identtinen versioissa 4, 5, ja 6, mutta Git merkitsee työkopiosi tiedoston Makefile versiolla 6 ilmaisemaan, että se on yhä ajan tasalla. Tehtyäsi päivityksen työkopiosi juurihakemistolle se vastaa yleisesti ottaen täsmälleen yhtä arkiston versiota." #. (title) #: ../source/TortoiseGit_en.xml:1325 @@ -1173,8 +1173,8 @@ msgstr "Kuinka työkopiot seuraavat arkiston tilaa" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" -msgstr "Subversion tallettaa jokaista työkopion tiedostoa varten kaksi oleellista tietoa .svn/ -hallintoalueelle:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" +msgstr "Git tallettaa jokaista työkopion tiedostoa varten kaksi oleellista tietoa .svn/ -hallintoalueelle:" #. (para) #: ../source/TortoiseGit_en.xml:1332 @@ -1188,8 +1188,8 @@ msgstr "aikaleiman, joka kertoo, milloin työkopio viimeksi päivitettiin arkist #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" -msgstr "Näiden tietojen avulla, keskustelemalla arkiston kanssa, Subversion-asiakas voi päätellä, missä seuraavista tiloista työkopion tiedosto on:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" +msgstr "Näiden tietojen avulla, keskustelemalla arkiston kanssa, Git-asiakas voi päätellä, missä seuraavista tiloista työkopion tiedosto on:" #. (term) #: ../source/TortoiseGit_en.xml:1352 @@ -1228,8 +1228,8 @@ msgstr "Paikallisesti muuttunut ja vanhentunut " #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." -msgstr "Tiedostoa on muutettu sekä työkopiossa että arkistossa. Komento toimita palauttaa virheen vanhentunut (out-of-date). Tiedosto pitää ensin päivittää; komento päivitä yrittää yhdistää julkaistut muutokset paikallisten muutosten kanssa. Mikäli Subversion ei kykene yhdistämään kaikkia muutoksia automaattisesti, syntyneiden ristiriitojen ratkaisu jätetään käyttäjän tehtäväksi." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgstr "Tiedostoa on muutettu sekä työkopiossa että arkistossa. Komento toimita palauttaa virheen vanhentunut (out-of-date). Tiedosto pitää ensin päivittää; komento päivitä yrittää yhdistää julkaistut muutokset paikallisten muutosten kanssa. Mikäli Git ei kykene yhdistämään kaikkia muutoksia automaattisesti, syntyneiden ristiriitojen ratkaisu jätetään käyttäjän tehtäväksi." #. (title) #: ../source/TortoiseGit_en.xml:1412 @@ -1238,8 +1238,8 @@ msgstr "Yhteenveto" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "Tässä luvussa käsiteltiin joukko keskeisiä Subversion-käsitteitä:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" +msgstr "Tässä luvussa käsiteltiin joukko keskeisiä Git-käsitteitä:" #. (para) #: ../source/TortoiseGit_en.xml:1419 @@ -1248,13 +1248,13 @@ msgstr "Olemme esitelleet käsitteet keskusarkisto, työkopio sekä ajatuksen jo #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." -msgstr "Olemme tarkastelleet muutamia pieniä esimerkkejä siitä, miten kaksi työtoveria voi käyttää Subversionia julkaistakseen ja saadakseen muutoksia toisiltaan käyttämällä 'kopioi-muuta-yhdistä' -mallia." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgstr "Olemme tarkastelleet muutamia pieniä esimerkkejä siitä, miten kaksi työtoveria voi käyttää Gitia julkaistakseen ja saadakseen muutoksia toisiltaan käyttämällä 'kopioi-muuta-yhdistä' -mallia." #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." -msgstr "Olemme puhuneet hieman Subversionin tavasta jäljittää ja hallinnoida työkopion tietoja." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." +msgstr "Olemme puhuneet hieman Gitin tavasta jäljittää ja hallinnoida työkopion tietoja." #. (title) #: ../source/TortoiseGit_en.xml:1445 @@ -1263,13 +1263,13 @@ msgstr "Palvelimen asennus" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." -msgstr "Käyttääksesi TortoiseGit-ohjelmaa (tai jotain toista Subversion-asiakasta), tarvitset paikan, missä arkistosi sijaitsevat. Voit tallettaa arkistosi joko paikallisesti ja kytkeytyä niihin käyttämällä file:// -yhteyskäytäntöä, tai voit sijoittaa arkistot palvelimelle ja kytkeytyä niihin http:// tai svn:// -yhteyskäytännöillä. Nämä kaksi palvelinyhteyskäytäntöä voidaan myös salata, jolloin ne ovat vastaavasti muotoa https:// tai svn+ssh://. Tässä luvussa näytetään vaiheittain, miten asennat tällaisen palvelimen Windows-alustalle." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgstr "Käyttääksesi TortoiseGit-ohjelmaa (tai jotain toista Git-asiakasta), tarvitset paikan, missä arkistosi sijaitsevat. Voit tallettaa arkistosi joko paikallisesti ja kytkeytyä niihin käyttämällä file:// -yhteyskäytäntöä, tai voit sijoittaa arkistot palvelimelle ja kytkeytyä niihin http:// tai svn:// -yhteyskäytännöillä. Nämä kaksi palvelinyhteyskäytäntöä voidaan myös salata, jolloin ne ovat vastaavasti muotoa https:// tai svn+ssh://. Tässä luvussa näytetään vaiheittain, miten asennat tällaisen palvelimen Windows-alustalle." #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." -msgstr "Yksityiskohtaisempaa tietoa Subversionin palvelinvaihtoehdoista sekä osviittaa sinulle parhaiten sopivan arkkitehtuurin valitsemiseksi löydät Subversion-kirjan kappaleesta Server Configuration." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." +msgstr "Yksityiskohtaisempaa tietoa Gitin palvelinvaihtoehdoista sekä osviittaa sinulle parhaiten sopivan arkkitehtuurin valitsemiseksi löydät Git-kirjan kappaleesta Server Configuration." #. (para) #: ../source/TortoiseGit_en.xml:1466 @@ -1293,8 +1293,8 @@ msgstr "Apache" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" -msgstr "Apache-pohjainen Subversion-palvelinasennus tarjoaa eniten mahdollisuuksia muunteluun. Vaikkakin onkin hieman monimutkaisempi asentaa, se tarjoaa etuja, joita muilla palvelimilla ei ole:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgstr "Apache-pohjainen Git-palvelinasennus tarjoaa eniten mahdollisuuksia muunteluun. Vaikkakin onkin hieman monimutkaisempi asentaa, se tarjoaa etuja, joita muilla palvelimilla ei ole:" #. (primary) #. (term) @@ -1305,8 +1305,8 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." -msgstr "Apache-pohjainen Subversion-palvelin käyttää WebDAV-yhteyskäytäntöä, jota myös monet muut ohjelmat tukevat. Voit esimerkiksi asentaa tällaisen arkiston Web-kansioksi Windows-resurssienhallintaan ja sitten käyttää sitä kuten mitä tahansa muuta tiedostojärjestelmän kansiota." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgstr "Apache-pohjainen Git-palvelin käyttää WebDAV-yhteyskäytäntöä, jota myös monet muut ohjelmat tukevat. Voit esimerkiksi asentaa tällaisen arkiston Web-kansioksi Windows-resurssienhallintaan ja sitten käyttää sitä kuten mitä tahansa muuta tiedostojärjestelmän kansiota." #. (term) #: ../source/TortoiseGit_en.xml:1509 @@ -1315,8 +1315,8 @@ msgstr "Arkiston selaaminen" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." -msgstr "Voit avata arkistosi paikantimen selaimellasi ja selata sen sisältöä asentamatta Subversion-asiakasta. Tällä tavalla tietosi ovat paljon laajemman käyttäjäkunnan saavutettavissa." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." +msgstr "Voit avata arkistosi paikantimen selaimellasi ja selata sen sisältöä asentamatta Git-asiakasta. Tällä tavalla tietosi ovat paljon laajemman käyttäjäkunnan saavutettavissa." #. (term) #. (title) @@ -1397,18 +1397,18 @@ msgstr "Apachen asentamiseksi tarvitset aluksi tietokoneen, jonka käyttöjärje #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Subversionin asentaminen" +msgid "Installing Git" +msgstr "Gitin asentaminen" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Lataa viimeisin versio Subversion Win32-paketista Apachelle. Varmista, että valitset Apache-versiotasi vastaavan version, muuten törmäät hämäriin virheilmoituksiin käynnistäessäsi koneesi uudelleen. Jos käytät Apache-versiota 2.2.x, siirry osoitteeseen http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Lataa viimeisin versio Git Win32-paketista Apachelle. Varmista, että valitset Apache-versiotasi vastaavan version, muuten törmäät hämäriin virheilmoituksiin käynnistäessäsi koneesi uudelleen. Jos käytät Apache-versiota 2.2.x, siirry osoitteeseen http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." -msgstr "Aja Subversion-asennusohjelma ja seuraa ohjeita. Mikäli asennusohjelma havaitsee, että olet jo asentanut Apachen, olet miltei valmis. Muussa tapauksessa sinun pitää suorittaa muutama ylimääräinen toimenpide." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgstr "Aja Git-asennusohjelma ja seuraa ohjeita. Mikäli asennusohjelma havaitsee, että olet jo asentanut Apachen, olet miltei valmis. Muussa tapauksessa sinun pitää suorittaa muutama ylimääräinen toimenpide." #. (primary) #. (primary) @@ -1419,13 +1419,13 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "Avaa Windows Resurssienhallinta ja siirry Subversion-asennushakemistoon (tavallisesti c:\\program files\\Subversion) ja etsi tiedostot /httpd/mod_dav_svn.so ja mod_authz_svn.so. Kopioi nämä tiedostot Apachen modulihakemistoon (tavallisesti c:\\program files\\apache group\\apache2\\modules)." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "Avaa Windows Resurssienhallinta ja siirry Git-asennushakemistoon (tavallisesti c:\\program files\\Git) ja etsi tiedostot /httpd/mod_dav_svn.so ja mod_authz_svn.so. Kopioi nämä tiedostot Apachen modulihakemistoon (tavallisesti c:\\program files\\apache group\\apache2\\modules)." #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." -msgstr "Kopioi tiedostot /bin/libdb*.dll ja /bin/intl3_svn.dll Subversion -asennushakemistosta Apachen bin-hakemistoon." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." +msgstr "Kopioi tiedostot /bin/libdb*.dll ja /bin/intl3_svn.dll Git -asennushakemistosta Apachen bin-hakemistoon." #. (para) #: ../source/TortoiseGit_en.xml:1677 @@ -1468,12 +1468,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "Lisää määrittelytiedoston loppuun seuraavat rivit: \n" "<Location /svn>\n" @@ -1482,12 +1482,12 @@ msgstr "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" Tämä määrittää Apachen niin, että kaikki Subversion-arkistosi ovat fyysisesti hakemiston D:\\SVN sisällä. Arkistot välitetään ulkomaailmalle paikantimella http://MyServer/svn/ . Kytkeytyminen on rajoitettu tunnettuihin käyttäjiin, jotka on lueteltu tiedostossa passwd." +" Tämä määrittää Apachen niin, että kaikki Git-arkistosi ovat fyysisesti hakemiston D:\\SVN sisällä. Arkistot välitetään ulkomaailmalle paikantimella http://MyServer/svn/ . Kytkeytyminen on rajoitettu tunnettuihin käyttäjiin, jotka on lueteltu tiedostossa passwd." #. (para) #: ../source/TortoiseGit_en.xml:1740 @@ -1511,13 +1511,13 @@ msgstr "Käynnistä Apache-palvelu uudestaan." #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "Avaa selainikkuna osoitteessa http://MyServer/svn/MyNewRepository (missä MyNewRepository on aiemmin luomasi Subversion-arkiston nimi). Jos kaikki meni hyvin, sinulta pyydetään käyttäjätunnusta ja salasanaa, minkä jälkeen arkiston sisältö ilmestyy näkyviin." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "Avaa selainikkuna osoitteessa http://MyServer/svn/MyNewRepository (missä MyNewRepository on aiemmin luomasi Git-arkiston nimi). Jos kaikki meni hyvin, sinulta pyydetään käyttäjätunnusta ja salasanaa, minkä jälkeen arkiston sisältö ilmestyy näkyviin." #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "Nyt olet asentanut Apachen ja Subversionin, mutta Apache ei osaa vielä palvella Subversion-asiakkaita (esim. TortoiseGit). Kertoaksesi Apachelle, mitä paikanninta Subversion-arkistot käyttävät sinun on muokatattava Apachen määrittelytiedostoa (tavallisesti paikassa c:\\program files\\apache group\\apache2\\conf\\httpd.conf) tekstieditorilla (esim. Notepad): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "Nyt olet asentanut Apachen ja Gitin, mutta Apache ei osaa vielä palvella Git-asiakkaita (esim. TortoiseGit). Kertoaksesi Apachelle, mitä paikanninta Git-arkistot käyttävät sinun on muokatattava Apachen määrittelytiedostoa (tavallisesti paikassa c:\\program files\\apache group\\apache2\\conf\\httpd.conf) tekstieditorilla (esim. Notepad): " #. (primary) #: ../source/TortoiseGit_en.xml:1777 @@ -1555,18 +1555,18 @@ msgstr "http://MyServer/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " -msgstr "tarkoittaa, että Subversion-arkistot ovat saatavilla paikantimella " +msgid "means that the Git repositories are available from the URL " +msgstr "tarkoittaa, että Git-arkistot ovat saatavilla paikantimella " #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "kertoo Apachelle, mikä moduli on vastuussa paikantimen palvelemisesta - tässä tapauksessa Subversion-moduli." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." +msgstr "kertoo Apachelle, mikä moduli on vastuussa paikantimen palvelemisesta - tässä tapauksessa Git-moduli." #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." -msgstr "sallii kaikkien takana olevien arkistojen luettelemisen. Käytettävissä Subversion-versiosta 1.3 eteenpäin." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." +msgstr "sallii kaikkien takana olevien arkistojen luettelemisen. Käytettävissä Git-versiosta 1.3 eteenpäin." #. (filename) #: ../source/TortoiseGit_en.xml:1822 @@ -1575,8 +1575,8 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " -msgstr "kertoo Subversionille, että arkistot ovat polun alapuolella" +msgid "tells Git to look for repositories below " +msgstr "kertoo Gitille, että arkistot ovat polun alapuolella" #. (entry) #: ../source/TortoiseGit_en.xml:1827 @@ -1600,8 +1600,8 @@ msgstr "määrittää, mitä salasanatiedostoa tunnistukseen käytetään" #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "Subversion-arkiston valtuutustiedoston sijainti (määrittää arkiston polkujen saantioikeudet)" +msgid "Location of the Access file for paths inside a Git repository" +msgstr "Git-arkiston valtuutustiedoston sijainti (määrittää arkiston polkujen saantioikeudet)" #. (entry) #: ../source/TortoiseGit_en.xml:1861 @@ -1632,11 +1632,11 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "passwd-tiedoston käyttö rajoittaa ja sallii yhdellä kertaa pääsyn kaikkiin arkistoihisi. Jos haluat määrittää tarkemmin, kellä käyttäjillä on pääsy mihinkin kansioon arkiston sisällä, voit poistaa kommentin riviltä \n" "#AuthzSVNAccessFile svnaccessfile\n" -" ja luoda Subversion -valtuutustiedoston. Apache varmistaa, että vain oikeat käyttäjät pääsevät kytkeytymään /svn-osoitteeseen, ja välittää tämän jälkeen käyttäjätunnuksen Subversionin AuthzSVNAccessFile-modulille, joka tekee hienosyisemmän tarkistuksen Subversionin valtuutustiedostossa olevien sääntöjen perusteella. Huomaa, että polut annetaan joko muodossa arkisto:polku tai yksinkertaisesti polku. Jos jätät arkiston antamatta jollekin säännölle, sääntö pätee kaikille arkistoille SVNParentPath-polun alla. mod_authz_svn-modulin valtuutustiedoston rakenne on kuvattu luvussa ." +" ja luoda Git -valtuutustiedoston. Apache varmistaa, että vain oikeat käyttäjät pääsevät kytkeytymään /svn-osoitteeseen, ja välittää tämän jälkeen käyttäjätunnuksen Gitin AuthzSVNAccessFile-modulille, joka tekee hienosyisemmän tarkistuksen Gitin valtuutustiedostossa olevien sääntöjen perusteella. Huomaa, että polut annetaan joko muodossa arkisto:polku tai yksinkertaisesti polku. Jos jätät arkiston antamatta jollekin säännölle, sääntö pätee kaikille arkistoille SVNParentPath-polun alla. mod_authz_svn-modulin valtuutustiedoston rakenne on kuvattu luvussa ." #. (para) #: ../source/TortoiseGit_en.xml:1915 @@ -1676,13 +1676,13 @@ msgstr "Projekti-indeksi" #. (para) #: ../source/TortoiseGit_en.xml:1955 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." -msgstr "Jos käytät SVNParentPath-komentoa, sinun ei tarvitse muuttaa Apachen määrittelytiedostoa aina, kun lisään uuden Subversion-arkiston. Riittää, että yksinkertaisesti luot uuden arkiston samaan paikkaan kuin ensimmäinen arkisto, ja olet valmis! Jos sinulla on suora pääsy tuohon palvelinkansioon, niin uuden arkiston luomiseksi riittää, kun luot työasemaltasi palvelinkansioon uuden alihakemiston ja annat TortoiseGit-komennon TortoiseGitLuo arkisto tähän...." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgstr "Jos käytät SVNParentPath-komentoa, sinun ei tarvitse muuttaa Apachen määrittelytiedostoa aina, kun lisään uuden Git-arkiston. Riittää, että yksinkertaisesti luot uuden arkiston samaan paikkaan kuin ensimmäinen arkisto, ja olet valmis! Jos sinulla on suora pääsy tuohon palvelinkansioon, niin uuden arkiston luomiseksi riittää, kun luot työasemaltasi palvelinkansioon uuden alihakemiston ja annat TortoiseGit-komennon TortoiseGitLuo arkisto tähän...." #. (para) #: ../source/TortoiseGit_en.xml:1969 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." -msgstr "Mikäli käytät Subversion-ohjelman versiota 1.3 tai uudempaa, voit komennolla SVNListParentPath on saada Apachen tuottamaan luettelon kaikista käytettävissä olevista arkistoista, kun avaat web-selaimella arkiston sijaan sen yläkansion." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgstr "Mikäli käytät Git-ohjelman versiota 1.3 tai uudempaa, voit komennolla SVNListParentPath on saada Apachen tuottamaan luettelon kaikista käytettävissä olevista arkistoista, kun avaat web-selaimella arkiston sijaan sen yläkansion." #. (title) #: ../source/TortoiseGit_en.xml:1977 @@ -1696,8 +1696,8 @@ msgstr "Valtuutus" #. (para) #: ../source/TortoiseGit_en.xml:1984 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." -msgstr "Modulin mod_authz_svn avulla arkiston saantioikeudet voidaan määritellä tarkemmin käyttäjätunnusten ja arkistopolkujen perusteella. Moduli on käytettävissä Apache-pohjaisen palvelimen kanssa, ja alkaen Subversion-versiosta 1.3 myös svnserve-palvelimen kanssa." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." +msgstr "Modulin mod_authz_svn avulla arkiston saantioikeudet voidaan määritellä tarkemmin käyttäjätunnusten ja arkistopolkujen perusteella. Moduli on käytettävissä Apache-pohjaisen palvelimen kanssa, ja alkaen Git-versiosta 1.3 myös svnserve-palvelimen kanssa." #. (para) #: ../source/TortoiseGit_en.xml:1990 @@ -1835,7 +1835,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1849,7 +1849,7 @@ msgid "" "SSPIOfferBasic On\n" " within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" -"Saadaksesi Subversionin käyttämään uutta tunnistustapaa muuta rivi \n" +"Saadaksesi Gitin käyttämään uutta tunnistustapaa muuta rivi \n" "AuthType Basic\n" " muotoon \n" "AuthType SSPI\n" @@ -1880,8 +1880,8 @@ msgstr "Katso ohjeet luvusta kytke #. (para) #: ../source/TortoiseGit_en.xml:2140 -msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." -msgstr "Subversionin AuthzSVNAccessFile-tiedostot tulkitsevat isot ja pienet kirjaimet eri merkeiksi käyttäjätunnuksissa (JUser on eri kuin juser)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgstr "Gitin AuthzSVNAccessFile-tiedostot tulkitsevat isot ja pienet kirjaimet eri merkeiksi käyttäjätunnuksissa (JUser on eri kuin juser)." #. (para) #: ../source/TortoiseGit_en.xml:2145 @@ -1890,8 +1890,8 @@ msgstr "Microsoft-maailmassa Windows-toimialueet ja käyttäjätunnukset eivät #. (para) #: ../source/TortoiseGit_en.xml:2150 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." -msgstr "Tämä eroavuus voi haitata sinua SSPI-tunnistusta käytettäessä, koska Windows-toimialuenimi ja käyttäjätunnus välitetään Subversionille suoraan käyttäjän kirjoittamassa muodossa. Internet Explorer välittää usein käyttäjätunnuksen Apachelle automaattisesti käyttäen tunnusta luotaessa käytettyä muotoa." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgstr "Tämä eroavuus voi haitata sinua SSPI-tunnistusta käytettäessä, koska Windows-toimialuenimi ja käyttäjätunnus välitetään Gitille suoraan käyttäjän kirjoittamassa muodossa. Internet Explorer välittää usein käyttäjätunnuksen Apachelle automaattisesti käyttäen tunnusta luotaessa käytettyä muotoa." #. (para) #: ../source/TortoiseGit_en.xml:2158 @@ -1900,8 +1900,8 @@ msgstr "Lopputulos on, että tarvitset ainakin kaksi alkiota AuthzSVNAc #. (para) #: ../source/TortoiseGit_en.xml:2166 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." -msgstr "Apachen virhe- ja saantilokit ovat parhaat ystäväsi, kun selvität tällaisia ongelmia - ne auttavat sinua päättelemään Subversionin AuthzSVNAccessFile-modulille välitetyn käyttäjätunnuksen muodon. Voit joutua kokeilemaan erilaisia käyttäjätunnuksen muotoja svnaccessfile-tiedostossa (esim.TOIMIALUE\\käyttäjä vs. TOIMIALUE//käyttäjä) saadaksesi kaiken toimimaan." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgstr "Apachen virhe- ja saantilokit ovat parhaat ystäväsi, kun selvität tällaisia ongelmia - ne auttavat sinua päättelemään Gitin AuthzSVNAccessFile-modulille välitetyn käyttäjätunnuksen muodon. Voit joutua kokeilemaan erilaisia käyttäjätunnuksen muotoja svnaccessfile-tiedostossa (esim.TOIMIALUE\\käyttäjä vs. TOIMIALUE//käyttäjä) saadaksesi kaiken toimimaan." #. (title) #: ../source/TortoiseGit_en.xml:2180 @@ -1915,8 +1915,8 @@ msgstr "Moninkertainen tunnistus" #. (para) #: ../source/TortoiseGit_en.xml:2184 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." -msgstr "On myös mahdollista määrittää useampi kuin yksi tunnistustapa Subversion-arkistollesi. Tätä varten sinun pitää tehdä jokaisesta tunnistustyypistä ei-määräävä, jotta Apache saadaan tarkistamaan ne kaikki täsmäävän käyttäjätunnus/salasana-parin löytämiseksi." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgstr "On myös mahdollista määrittää useampi kuin yksi tunnistustapa Git-arkistollesi. Tätä varten sinun pitää tehdä jokaisesta tunnistustyypistä ei-määräävä, jotta Apache saadaan tarkistamaan ne kaikki täsmäävän käyttäjätunnus/salasana-parin löytämiseksi." #. (para) #: ../source/TortoiseGit_en.xml:2190 @@ -1945,7 +1945,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1970,7 +1970,7 @@ msgstr "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2097,13 +2097,13 @@ msgstr "SSL ja Internet Explorer" #. (para) #: ../source/TortoiseGit_en.xml:2339 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." -msgstr "Jos salaat palvelinliikenteen SSL-käytännöllä ja käytät Windows-toimialuetunnistusta, huomaat, ettei arkiston selaus Internet Explorer -selaimella toimi enää. Tämä johtuu Internet Explorerin kyvyttömyydestä tunnistaa käyttäjä tässä yhteydessä. Muilla selaimilla ei ole tätä ongelmaa, ja TortoiseGit (kuten muutkin Subversion-asiakkaat) kykenee tunnistamaan käyttäjän." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." +msgstr "Jos salaat palvelinliikenteen SSL-käytännöllä ja käytät Windows-toimialuetunnistusta, huomaat, ettei arkiston selaus Internet Explorer -selaimella toimi enää. Tämä johtuu Internet Explorerin kyvyttömyydestä tunnistaa käyttäjä tässä yhteydessä. Muilla selaimilla ei ole tätä ongelmaa, ja TortoiseGit (kuten muutkin Git-asiakkaat) kykenee tunnistamaan käyttäjän." #. (para) #: ../source/TortoiseGit_en.xml:2353 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." -msgstr "määritä erillinen <Location /path> -osa Apachen määrittelytiedostoon ja lisää komento SSPIBasicPreferred On. Tämä mahdollistaa IE-tunnistuksen jälleen, mutta muut selaimet ja Subversion eivät kykene tunnistamaan käyttäjiä annettua polkua vastaan." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." +msgstr "määritä erillinen <Location /path> -osa Apachen määrittelytiedostoon ja lisää komento SSPIBasicPreferred On. Tämä mahdollistaa IE-tunnistuksen jälleen, mutta muut selaimet ja Git eivät kykene tunnistamaan käyttäjiä annettua polkua vastaan." #. (para) #: ../source/TortoiseGit_en.xml:2363 @@ -2137,8 +2137,8 @@ msgstr "Pakotettu SSL-kytkeytyminen" #. (para) #: ../source/TortoiseGit_en.xml:2395 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." -msgstr "Kun olet ottanut SSL-tekniikan käyttöön parantaaksesi arkistosi turvallisuutta, saatat haluta estää normaalin kytkeytymisen (http) ja sallia vain https-kytkeytymisen. Tämä vaatii ylimääräisen SSLRequireSSL-komennon Subversionin <Location>-lohkoon." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." +msgstr "Kun olet ottanut SSL-tekniikan käyttöön parantaaksesi arkistosi turvallisuutta, saatat haluta estää normaalin kytkeytymisen (http) ja sallia vain https-kytkeytymisen. Tämä vaatii ylimääräisen SSLRequireSSL-komennon Gitin <Location>-lohkoon." #. (para) #: ../source/TortoiseGit_en.xml:2402 @@ -2149,7 +2149,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2162,7 +2162,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2181,8 +2181,8 @@ msgstr "Lähetetty TortoiseGit-postituslistalle Nigel Greenin toimesta. Kiitos!" #. (para) #: ../source/TortoiseGit_en.xml:2424 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." -msgstr "Joissain tapauksissa saatat joutua määrittämään yhdelle palvelimelle kaksi SSL-näennäispalvelinta: Yhden ilman asiakasvarmennetta julkista verkkoa varten ja toisen pakollisen asiakasvarmenteen kanssa Subversion-asiakkaille." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." +msgstr "Joissain tapauksissa saatat joutua määrittämään yhdelle palvelimelle kaksi SSL-näennäispalvelinta: Yhden ilman asiakasvarmennetta julkista verkkoa varten ja toisen pakollisen asiakasvarmenteen kanssa Git-asiakkaille." #. (para) #: ../source/TortoiseGit_en.xml:2430 @@ -2192,11 +2192,11 @@ msgstr "Lisäämällä SSLVerifyClient Optional-direktiivin A #. (para) #: ../source/TortoiseGit_en.xml:2440 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" -"Ratkaisu on lisätä seuraava direktiivi siihen näennäiskonehakemistoon, jonka haluat varata Subversion-käyttöön: \n" +"Ratkaisu on lisätä seuraava direktiivi siihen näennäiskonehakemistoon, jonka haluat varata Git-käyttöön: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " Direktiivi sallii pääsyn hakemistoon vain, jos asiakasvarmenne vastaanotetaan ja tarkastetaan onnistuneesti." @@ -2214,10 +2214,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2238,9 +2238,9 @@ msgstr "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Näennäiskonemäärittely SUBVERSIONille (pakollinen varmenne)\n" +"### Näennäiskonemäärittely Gitille (pakollinen varmenne)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2258,8 +2258,8 @@ msgstr "Svnserve-palvelin" #. (para) #: ../source/TortoiseGit_en.xml:2485 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." -msgstr "Joissain tilanteissa ei ole mahdollista käyttää Apache-palvelinta. Tällöin kyseeseen voi tulla Subversionin mukana tuleva Svnserve - kevyt palvelin, joka käyttää omaa yhteyskäytäntöä tavallisen TCP/IP-yhteyden päällä." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgstr "Joissain tilanteissa ei ole mahdollista käyttää Apache-palvelinta. Tällöin kyseeseen voi tulla Gitin mukana tuleva Svnserve - kevyt palvelin, joka käyttää omaa yhteyskäytäntöä tavallisen TCP/IP-yhteyden päällä." #. (para) #: ../source/TortoiseGit_en.xml:2491 @@ -2273,23 +2273,23 @@ msgstr "Svnserven asennus" #. (para) #: ../source/TortoiseGit_en.xml:2502 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." -msgstr "Nouda Subversion-ohjelman viimeinen versio osoitteesta http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Vaihtoehtoisesti voit noutaa CollabNet-asennusohjelman osoitteesta http://www.collab.net/downloads/subversion. Jälkimmäinen asentaa svnserve-ohjelman suoraan Windows-palveluksi ja sisältää myös muutamia SASL-työkaluja." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgstr "Nouda Git-ohjelman viimeinen versio osoitteesta http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Vaihtoehtoisesti voit noutaa CollabNet-asennusohjelman osoitteesta http://www.collab.net/downloads/Git. Jälkimmäinen asentaa svnserve-ohjelman suoraan Windows-palveluksi ja sisältää myös muutamia SASL-työkaluja." #. (para) #: ../source/TortoiseGit_en.xml:2516 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." -msgstr "Mikäli Subversion on jo asennettu (ja svnserve on käynnissä), sinun pitää pysäyttää se ennen asennuksen jatkamista." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." +msgstr "Mikäli Git on jo asennettu (ja svnserve on käynnissä), sinun pitää pysäyttää se ennen asennuksen jatkamista." #. (para) #: ../source/TortoiseGit_en.xml:2522 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." -msgstr "Suorita Subversion-asennusohjelma. Jos suoritat asennuksen palvelimellasi (suositeltavaa), voit ohittaa kohdan 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." +msgstr "Suorita Git-asennusohjelma. Jos suoritat asennuksen palvelimellasi (suositeltavaa), voit ohittaa kohdan 4." #. (para) #: ../source/TortoiseGit_en.xml:2528 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "Avaa resurssienhallinta ja siirry Subversion-asennushakemistoon (yleensä C:\\Program Files\\Subversion); etsi bin-hakemistosta tiedostot svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll ja ssleay32.dll - kopioi nämä tiedostot (vaihtoehtoisesti koko bin-hakemisto), uuteen hakemistoon palvelimellasi (esim. c:\\svnserve)." +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "Avaa resurssienhallinta ja siirry Git-asennushakemistoon (yleensä C:\\Program Files\\Git); etsi bin-hakemistosta tiedostot svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll ja ssleay32.dll - kopioi nämä tiedostot (vaihtoehtoisesti koko bin-hakemisto), uuteen hakemistoon palvelimellasi (esim. c:\\svnserve)." #. (title) #: ../source/TortoiseGit_en.xml:2550 @@ -2359,36 +2359,36 @@ msgstr "Svnserven suorittaminen Windows-palveluna" #. (para) #: ../source/TortoiseGit_en.xml:2624 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." -msgstr "Svnserven suorittaminen normaalina käyttäjänä ei ole yleensä paras tapa. Se tarkoittaa, että palvelimellasi pitää aina olla joku käyttäjä kirjautuneena, myös mahdollisten uudelleen käynnistysten jälkeen. On parempi suorittaa svnserve Windows-palveluna. Subversion-versiosta 1.4 lähtien svnserve voidaan asentaa Windows-palveluksi." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." +msgstr "Svnserven suorittaminen normaalina käyttäjänä ei ole yleensä paras tapa. Se tarkoittaa, että palvelimellasi pitää aina olla joku käyttäjä kirjautuneena, myös mahdollisten uudelleen käynnistysten jälkeen. On parempi suorittaa svnserve Windows-palveluna. Git-versiosta 1.4 lähtien svnserve voidaan asentaa Windows-palveluksi." #. (para) #: ../source/TortoiseGit_en.xml:2631 msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Asentaaksesi svnserven Windows-palveluksi, suorita seuraava komento (kaikki yhdellä rivillä) luodaksesi palvelun, joka käynnistyy automaattisesti Windowsin käynnistyessä. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " Mikäli joissain poluissa on välilyöntejä, pitää ne ympäröidä lainausmerkein: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " Voit myös lisätä kuvauksen luotuasi palvelun. Tämä näkyy Windowsin Palvelut-toiminnossa. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" #. (para) @@ -2401,11 +2401,11 @@ msgstr "Huomaa sc -komennon käyttämä epätavallinen koment msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Microsoft suosittelee nykyisin, että palvelut suoritetaan joko Local Service tai Network Service -tunnuksella. Katso lisätietoja dokumentista The Services and Service Accounts Security Planning Guide. Luodaksesi palvelun Local Service -tunnukselle, lisää seuraava yllä olevaan esimerkkiin: \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Huomaa, että Local Service -tunnukselle tulee antaa riittävät oikeudet sekä Subversioniin että arkistoihisi. Tämä pätee myös komentojonojen käyttämiin sovelluksiin. Tällaisille käyttäjille on valmiiksi ryhmä nimeltä \"LOCAL SERVICE\"." +" Huomaa, että Local Service -tunnukselle tulee antaa riittävät oikeudet sekä Gitiin että arkistoihisi. Tämä pätee myös komentojonojen käyttämiin sovelluksiin. Tällaisille käyttäjille on valmiiksi ryhmä nimeltä \"LOCAL SERVICE\"." #. (para) #: ../source/TortoiseGit_en.xml:2678 @@ -2483,8 +2483,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2755 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" -msgstr "Jos pidät yllä useita arkistoja käyttäen samaa tunnussanatietokantaa, tunnistusalueen käyttö helpottaa käyttäjien elämää, koska TortoiseGit voi tallettaa salasanatietosi, eikä niitä tarvitse syöttää kuin kerran. Löydät lisätietoa Subversion-kirjasta, erityisesti osista Create a 'users' file and realm ja Client Credentials Caching." +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgstr "Jos pidät yllä useita arkistoja käyttäen samaa tunnussanatietokantaa, tunnistusalueen käyttö helpottaa käyttäjien elämää, koska TortoiseGit voi tallettaa salasanatietosi, eikä niitä tarvitse syöttää kuin kerran. Löydät lisätietoa Git-kirjasta, erityisesti osista Create a 'users' file and realm ja Client Credentials Caching." #. (title) #: ../source/TortoiseGit_en.xml:2773 @@ -2503,13 +2503,13 @@ msgstr "Mikä SASL on?" #. (para) #: ../source/TortoiseGit_en.xml:2779 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." -msgstr "Cyrus Simple Authentication and Security Layer (SASL) on Carnegie Mellon -yliopistossa kehitetty avoimen lähdekoodin ohjelmisto. Se lisää tunnistus- ja salausominaisuudet mihin tahansa verkkoyhteyskäytäntöön, ja Subversion-ohjelman versiosta 1.5 lähtien sekä svnserve-palvelin että TortoiseGit-asiakas tukevat sitä." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgstr "Cyrus Simple Authentication and Security Layer (SASL) on Carnegie Mellon -yliopistossa kehitetty avoimen lähdekoodin ohjelmisto. Se lisää tunnistus- ja salausominaisuudet mihin tahansa verkkoyhteyskäytäntöön, ja Git-ohjelman versiosta 1.5 lähtien sekä svnserve-palvelin että TortoiseGit-asiakas tukevat sitä." #. (para) #: ../source/TortoiseGit_en.xml:2787 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." -msgstr "Täydellisempi kuvaus löytyy Subversion-kirjan luvusta Using svnserve with SASLUsing svnserve with SASL. Jos haluat pelkästään asentaa tunnistuksen ja salauksen Windows-palvelimelle suojataksesi arkistosi siten, että sen käyttö voidaan sallia Internetistä, lue eteenpäin." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgstr "Täydellisempi kuvaus löytyy Git-kirjan luvusta Using svnserve with SASLUsing svnserve with SASL. Jos haluat pelkästään asentaa tunnistuksen ja salauksen Windows-palvelimelle suojataksesi arkistosi siten, että sen käyttö voidaan sallia Internetistä, lue eteenpäin." #. (title) #: ../source/TortoiseGit_en.xml:2800 @@ -2529,13 +2529,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2810 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." -msgstr "Luo seuraavaksi svn.conf-niminen tiedosto sopivaan paikkaan - tyypillisesti Subversion-asennushakemistoon." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." +msgstr "Luo seuraavaksi svn.conf-niminen tiedosto sopivaan paikkaan - tyypillisesti Git-asennushakemistoon." #. (para) #: ../source/TortoiseGit_en.xml:2815 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." -msgstr "Kolmanneksi, luo kaksi uutta rekisteriavainta kertoaksesi SASLin käyttöön. Luo avain [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] ja lisää siihen kaksi uutta merkkijonoavainta: SearchPath, joka kertoo sasl*.dll-tiedostot sisältävän hakemistopolun (tavallisesti Subversion-asennushakemisto), ja avain ConfFile, joka sisältää svn.conf-tiedoston hakemistopolun. Jos käytät Collabnet-asennusohjelmaa, rekisteriavaimet luodaan automaattisesti." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgstr "Kolmanneksi, luo kaksi uutta rekisteriavainta kertoaksesi SASLin käyttöön. Luo avain [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] ja lisää siihen kaksi uutta merkkijonoavainta: SearchPath, joka kertoo sasl*.dll-tiedostot sisältävän hakemistopolun (tavallisesti Git-asennushakemisto), ja avain ConfFile, joka sisältää svn.conf-tiedoston hakemistopolun. Jos käytät Collabnet-asennusohjelmaa, rekisteriavaimet luodaan automaattisesti." #. (para) #: ../source/TortoiseGit_en.xml:2827 @@ -2624,8 +2624,8 @@ msgstr "Luvussa kuvataan palvelimen asennukse #. (para) #: ../source/TortoiseGit_en.xml:2915 -msgid "Further information about svnserve can be found in the Version Control with Subversion." -msgstr "Lisätietoa svnservestä löytyy Subversion-kirjasta, kappaleesta Version Control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." +msgstr "Lisätietoa svnservestä löytyy Git-kirjasta, kappaleesta Version Control with Git." #. (title) #: ../source/TortoiseGit_en.xml:2923 @@ -2635,25 +2635,25 @@ msgstr "Polkuihin perustuva valtuutus svnservellä" #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" -"Subversion-versiosta 1.3 alkaen svnserve tukee samaa mod_authz_svn polkuihin perustuvaa valtuutusmekanismia kuin mikä on käytössä Apache-palvelimella. Ottaaksesi sen käyttöön sinun pitää muokata tiedostoa conf/svnserve.conf arkiston asennushakemistossa ja lisätä rivi, joka viittaa valtuutustiedostoosi. \n" +"Git-versiosta 1.3 alkaen svnserve tukee samaa mod_authz_svn polkuihin perustuvaa valtuutusmekanismia kuin mikä on käytössä Apache-palvelimella. Ottaaksesi sen käyttöön sinun pitää muokata tiedostoa conf/svnserve.conf arkiston asennushakemistossa ja lisätä rivi, joka viittaa valtuutustiedostoosi. \n" "[general]\n" "authz-db = authz\n" " Tässä authz on tiedosto, johon määrittelet saantioikeudet. Voit käyttää erillistä tiedostoa kullekin arkistolle tai voit jakaa saman tiedoston useiden arkistojen välillä. Luvusta löydät tiedoston rakenteen kuvauksen." #. (para) #: ../source/TortoiseGit_en.xml:2946 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." -msgstr "Riippumatta yhteyskäytännöstä, jota käytät kytkeytyessäsi arkistoihisi, sinun täytyy aina luoda vähintään yksi arkisto. Tämän voi tehdä joko Subversion-komentoriviltä tai TortoiseGit:n avulla." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." +msgstr "Riippumatta yhteyskäytännöstä, jota käytät kytkeytyessäsi arkistoihisi, sinun täytyy aina luoda vähintään yksi arkisto. Tämän voi tehdä joko Git-komentoriviltä tai TortoiseGit:n avulla." #. (para) #: ../source/TortoiseGit_en.xml:2951 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "Jos et ole vielä luonut Subversion-arkistoa, niin nyt on hyvä aika tehdä se." +msgid "If you haven't created a Git repository yet, it's time to do that now." +msgstr "Jos et ole vielä luonut Git-arkistoa, niin nyt on hyvä aika tehdä se." #. (title) #: ../source/TortoiseGit_en.xml:2959 @@ -2667,8 +2667,8 @@ msgstr "luo arkisto" #. (para) #: ../source/TortoiseGit_en.xml:2963 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." -msgstr "Voit luoda arkiston uudemmassa FSFS-muodossa tai vanhemmassa Berkeley Database (BDB) -muodossa. FSFS on yleisesti ottaen nopeampi ja toimii verkkojakojen sekä Windows 98:n kanssa ongelmitta. BDB on vakaampi, koska se on ollut käytössä pidempään; toisaalta FSFS on nyt ollut käytössä vuosia, joten perustelu ontuu hieman. Lue lisää Subversion-kirjan kappaleesta Choosing a Data Store." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." +msgstr "Voit luoda arkiston uudemmassa FSFS-muodossa tai vanhemmassa Berkeley Database (BDB) -muodossa. FSFS on yleisesti ottaen nopeampi ja toimii verkkojakojen sekä Windows 98:n kanssa ongelmitta. BDB on vakaampi, koska se on ollut käytössä pidempään; toisaalta FSFS on nyt ollut käytössä vuosia, joten perustelu ontuu hieman. Lue lisää Git-kirjan kappaleesta Choosing a Data Store." #. (title) #: ../source/TortoiseGit_en.xml:2978 @@ -2779,8 +2779,8 @@ msgstr "UNC-polut" #. (para) #: ../source/TortoiseGit_en.xml:3094 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." -msgstr "Käyttääksesi paikallista arkistoasi tarvitset polun sen sisältävään kansioon. Muista, että Subversion odottaa kaikkien arkistopolkujen olevan muotoa file:///C:/SVNRepository/. Huomaa kauttaviivojen '/' käyttö." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgstr "Käyttääksesi paikallista arkistoasi tarvitset polun sen sisältävään kansioon. Muista, että Git odottaa kaikkien arkistopolkujen olevan muotoa file:///C:/SVNRepository/. Huomaa kauttaviivojen '/' käyttö." #. (para) #: ../source/TortoiseGit_en.xml:3100 @@ -2819,8 +2819,8 @@ msgstr "Ensinnäkin: kaikilla käyttäjillä on suora kirjoitusoikeus arkistoon, #. (para) #: ../source/TortoiseGit_en.xml:3141 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." -msgstr "Toisekseen, kaikki verkkojakojen yhteyskäytännöt eivät tue Subversionin tarvitsemaa lukitustyyliä, joten arkistosi saattaa mennä sekaisin. Voi olla, että näin ei käy heti, mutta jonain päivänä kaksi käyttäjää yrittää varmasti käyttää arkistoa samanaikaisesti." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgstr "Toisekseen, kaikki verkkojakojen yhteyskäytännöt eivät tue Gitin tarvitsemaa lukitustyyliä, joten arkistosi saattaa mennä sekaisin. Voi olla, että näin ei käy heti, mutta jonain päivänä kaksi käyttäjää yrittää varmasti käyttää arkistoa samanaikaisesti." #. (para) #: ../source/TortoiseGit_en.xml:3147 @@ -2923,8 +2923,8 @@ msgstr "Jos otat käyttöön päätason /trunk /tags /branchessvnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "svnadmin -työkalu asentuu Subversion-komentorivityökalun asennuksen yhteydessä. Jos asennat komentorivityökaluja Windows-ympäristöön, on parasta käyttää Windows-asennusohjelmaa. Se on pakattu paremmin kuin .zip -versio, joten paketti on pienempi; se pitää muös huolen polkujen asettamisesta puolestasi. Voit noutaa viimeisimmän Subversion-komentoriviasiakkaan osoitteesta http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "svnadmin -työkalu asentuu Git-komentorivityökalun asennuksen yhteydessä. Jos asennat komentorivityökaluja Windows-ympäristöön, on parasta käyttää Windows-asennusohjelmaa. Se on pakattu paremmin kuin .zip -versio, joten paketti on pienempi; se pitää muös huolen polkujen asettamisesta puolestasi. Voit noutaa viimeisimmän Git-komentoriviasiakkaan osoitteesta http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:3347 @@ -3039,8 +3039,8 @@ msgstr "palvelimen komentojonot" #. (para) #: ../source/TortoiseGit_en.xml:3357 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." -msgstr "Toimintokomento on ohjelma, joka käynnistyy jonkin arkistotapahtuman (esim. uuden version luonti tai versioimattoman ominaisuuden muokkaus) takia. Kullekin toimintokomennolle annetaan tiedot tapahtumasta ja sen kohteesta/kohteista, samoin kuin tapahtuman suorittaneen henkilön käyttäjätunnus. Toimintokomennon tuloksista tai tuloskoodista riippuen komento voi jatkaa tapahtumaa, keskeyttää sen tai viivästyttää sitä jollain tavoin. Lue Subversion-kirjan kappaleesta Hook Scripts yksityiskohtaisempaa tietoa tuetuista toimintokomentotyypeistä." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." +msgstr "Toimintokomento on ohjelma, joka käynnistyy jonkin arkistotapahtuman (esim. uuden version luonti tai versioimattoman ominaisuuden muokkaus) takia. Kullekin toimintokomennolle annetaan tiedot tapahtumasta ja sen kohteesta/kohteista, samoin kuin tapahtuman suorittaneen henkilön käyttäjätunnus. Toimintokomennon tuloksista tai tuloskoodista riippuen komento voi jatkaa tapahtumaa, keskeyttää sen tai viivästyttää sitä jollain tavoin. Lue Git-kirjan kappaleesta Hook Scripts yksityiskohtaisempaa tietoa tuetuista toimintokomentotyypeistä." #. (para) #: ../source/TortoiseGit_en.xml:3372 @@ -3091,8 +3091,8 @@ msgstr "verkkosivusto" #. (para) #: ../source/TortoiseGit_en.xml:3411 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." -msgstr "Jos haluat saattaa Subversion-arkistosi muiden käyttöön, voit lisätä siihen osoittavan linkin web-sivustoosi. Eräs tapa tähän on noutolinkin lisääminen muille TortoiseGit-käyttäjille." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgstr "Jos haluat saattaa Git-arkistosi muiden käyttöön, voit lisätä siihen osoittavan linkin web-sivustoosi. Eräs tapa tähän on noutolinkin lisääminen muille TortoiseGit-käyttäjille." #. (para) #: ../source/TortoiseGit_en.xml:3417 @@ -3157,18 +3157,18 @@ msgstr "Päivittäisen käytön opas" #. (para) #: ../source/TortoiseGit_en.xml:3457 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." -msgstr "Tämä luku kuvaa TortoiseGit-asiakkaan päivittäisen käytön. Se ei ole johdatus versionhallintajärjestelmien perusteisiin eikä johdatus Subversionin (SVN) käyttöön. Kyseessä on pikemminkin ohje, jonka puoleen voit kääntyä, kun tiedät suunnilleen, mitä haluat tehdä, mutta et aivan muista, miten se tehdään." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgstr "Tämä luku kuvaa TortoiseGit-asiakkaan päivittäisen käytön. Se ei ole johdatus versionhallintajärjestelmien perusteisiin eikä johdatus Gitin (SVN) käyttöön. Kyseessä on pikemminkin ohje, jonka puoleen voit kääntyä, kun tiedät suunnilleen, mitä haluat tehdä, mutta et aivan muista, miten se tehdään." #. (para) #: ../source/TortoiseGit_en.xml:3465 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." -msgstr "Jos tarvitset johdantoa versionhallintaan Subversionin avulla, suosittelemme, että luet mainion kirjan Version Control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." +msgstr "Jos tarvitset johdantoa versionhallintaan Gitin avulla, suosittelemme, että luet mainion kirjan Version Control with Git." #. (para) #: ../source/TortoiseGit_en.xml:3472 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." -msgstr "Tämä käyttöohje päivittyy jatkuvasti, samoin kuin TortoiseGit ja Subversion. Jos löydät virheitä, ole hyvä ja kerro niistä postituslistalla, jotta voimme päivittää käyttöohjeen. Jotkut ruutukaappaukset Päivittäisen käytön oppaassa (PKO) eivät ehkä vastaa ohjelman nykyistä ulkoasua. Ole kärsivällinen. Työskentelemme TortoiseGit:n parissa vapaa-aikanamme. " +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgstr "Tämä käyttöohje päivittyy jatkuvasti, samoin kuin TortoiseGit ja Git. Jos löydät virheitä, ole hyvä ja kerro niistä postituslistalla, jotta voimme päivittää käyttöohjeen. Jotkut ruutukaappaukset Päivittäisen käytön oppaassa (PKO) eivät ehkä vastaa ohjelman nykyistä ulkoasua. Ole kärsivällinen. Työskentelemme TortoiseGit:n parissa vapaa-aikanamme. " #. (para) #: ../source/TortoiseGit_en.xml:3484 @@ -3182,13 +3182,13 @@ msgstr "Sinun pitäisi olla sinut versionhallintajärjestelmien periaatteiden ka #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." -msgstr "Sinun pitäisi tietää perusteet Subversionista." +msgid "You should know the basics of Git." +msgstr "Sinun pitäisi tietää perusteet Gitista." #. (para) #: ../source/TortoiseGit_en.xml:3499 -msgid "You should have set up a server and/or have access to a Subversion repository." -msgstr "Sinulla pitäisi olla asennettu palvelin ja/tai pääsy Subversion-arkistoon." +msgid "You should have set up a server and/or have access to a Git repository." +msgstr "Sinulla pitäisi olla asennettu palvelin ja/tai pääsy Git-arkistoon." #. (para) #: ../source/TortoiseGit_en.xml:3480 @@ -3377,13 +3377,13 @@ msgstr "svn.username sisältää tiedot pelkän käyttäjä #. (para) #: ../source/TortoiseGit_en.xml:3650 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " -msgstr "Mikäli arkisto käyttää salasanasuojausta, esiin aukeaa tunnistusikkuna. Syötä käyttäjätunnuksesi ja salasanasi. Valintaruudun avulla voit tallettaa tiedot Subversionin oletushakemiston %APPDATA%\\Subversion\\auth kolmeen alihakemistoon: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " +msgstr "Mikäli arkisto käyttää salasanasuojausta, esiin aukeaa tunnistusikkuna. Syötä käyttäjätunnuksesi ja salasanasi. Valintaruudun avulla voit tallettaa tiedot Gitin oletushakemiston %APPDATA%\\Git\\auth kolmeen alihakemistoon: " #. (para) #: ../source/TortoiseGit_en.xml:3681 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." -msgstr "Mikäli haluat tyhjentää talletetut tunnistetiedot kaikille palvelimille, voit tehdä sen TortoiseGit:n asetusikkunan Tallennetut tiedot -sivulla. Painike tyhjentää kaikki talletetut tunnistetiedot Subversionin auth-hakemistoista, samoin kuin TortoiseGit:n aiempien versioiden rekisteriin tallettamat tunnistetiedot. Katso myös ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgstr "Mikäli haluat tyhjentää talletetut tunnistetiedot kaikille palvelimille, voit tehdä sen TortoiseGit:n asetusikkunan Tallennetut tiedot -sivulla. Painike tyhjentää kaikki talletetut tunnistetiedot Gitin auth-hakemistoista, samoin kuin TortoiseGit:n aiempien versioiden rekisteriin tallettamat tunnistetiedot. Katso myös ." #. (para) #: ../source/TortoiseGit_en.xml:3690 @@ -3458,8 +3458,8 @@ msgstr "On helppoa vahingossa tuoda tiedostot arkistoon väärälle kansiotasoll #. (para) #: ../source/TortoiseGit_en.xml:3736 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." -msgstr "Tämä luku kuvaa Subversionin tuontikomennon, joka suunniteltiin kansiohierarkian tallettamiseksi arkistoon yhdellä kertaa. Vaikka tämä onnistuukin, komennossa on muutamia puutteita: Näistä syistä suosittelemme, ettet käytä tuontikomentoa, vaan noudatat sen sijaan luvussa . kuvattua kaksivaiheista menetelmää. Seuraavat kappaleet kuvaavat kuitenkin itse tuontikomennon toiminnan." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgstr "Tämä luku kuvaa Gitin tuontikomennon, joka suunniteltiin kansiohierarkian tallettamiseksi arkistoon yhdellä kertaa. Vaikka tämä onnistuukin, komennossa on muutamia puutteita: Näistä syistä suosittelemme, ettet käytä tuontikomentoa, vaan noudatat sen sijaan luvussa . kuvattua kaksivaiheista menetelmää. Seuraavat kappaleet kuvaavat kuitenkin itse tuontikomennon toiminnan." #. (para) #: ../source/TortoiseGit_en.xml:3768 @@ -3578,8 +3578,8 @@ msgstr "Voit esimerkiksi vilkaista TortoiseGit:n käännöskomentojonoa. Se kuts #. (para) #: ../source/TortoiseGit_en.xml:3916 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." -msgstr "Lopuksi lisäsimme vielä tiedoston TortoiseVars.bat isähakemistonsa ohituslistaan, ts. sisällytimme sen Subversion-ominaisuuteen svn:ignore. Siten se ei turhaan näy toimitusikkunassa." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgstr "Lopuksi lisäsimme vielä tiedoston TortoiseVars.bat isähakemistonsa ohituslistaan, ts. sisällytimme sen Git-ominaisuuteen svn:ignore. Siten se ei turhaan näy toimitusikkunassa." #. (title) #: ../source/TortoiseGit_en.xml:3925 @@ -3606,17 +3606,17 @@ msgstr "Joskus on hyödyllistä koota työkopio, joka on tehty usealla hakuopera #. (para) #: ../source/TortoiseGit_en.xml:3940 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" -"Oletetaan, että haet työkopion projektista /project1 kansioon D:\\dev\\project1. Valitse kansio D:\\dev\\project1, napsauta hiiren oikeaa näppäintä ja valitse Windows-valikkoOminaisuudet kontekstivalikosta. Ominaisuusikkuna aukeaa. Siirry sitten Subversion-välilehdelle; siellä voit muuttaa ominaisuuksia. Napsauta Lisää.... Valitse ominaisuus svn:externals pudotusvalikosta ja kirjoita syötekenttään arkiston paikannin muodossa nimi paikannin, tai jos haluat määritellä tietyn version, nimi -rREV paikannin. Voit lisätä useita ulkoisia projekteja, jokainen omalle rivilleen. Huomaa, että paikantimien on oltava täsmälleen oikein toimiakseen - välilyöntien on esimerkiksi oltava muodossa %20. Huomaa myös, ettei ole mahdollista käyttää kansionimiä, joissa on välilyöntejä. Oletetaan, että olet asettanut seuraavat ominaisuudet kansiolle D:\\dev\\project1: \n" +"Oletetaan, että haet työkopion projektista /project1 kansioon D:\\dev\\project1. Valitse kansio D:\\dev\\project1, napsauta hiiren oikeaa näppäintä ja valitse Windows-valikkoOminaisuudet kontekstivalikosta. Ominaisuusikkuna aukeaa. Siirry sitten Git-välilehdelle; siellä voit muuttaa ominaisuuksia. Napsauta Lisää.... Valitse ominaisuus svn:externals pudotusvalikosta ja kirjoita syötekenttään arkiston paikannin muodossa nimi paikannin, tai jos haluat määritellä tietyn version, nimi -rREV paikannin. Voit lisätä useita ulkoisia projekteja, jokainen omalle rivilleen. Huomaa, että paikantimien on oltava täsmälleen oikein toimiakseen - välilyöntien on esimerkiksi oltava muodossa %20. Huomaa myös, ettei ole mahdollista käyttää kansionimiä, joissa on välilyöntejä. Oletetaan, että olet asettanut seuraavat ominaisuudet kansiolle D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Napsauta nyt Aseta -painiketta ja toimita muutokset arkistoon. Kun seuraavan kerran päivität työkopiosi, Subversion luo alikansion D:\\dev\\project1\\sounds ja hakee sinne sounds-projektin, toisen alikansion D:\\dev\\project1\\quick graphs joka sisältää graphs-projektin ja lopuksi upotetun alikansion D:\\dev\\project1\\skins\\toolkit, joka sisältää skin-maker -projektin version 21." +" Napsauta nyt Aseta -painiketta ja toimita muutokset arkistoon. Kun seuraavan kerran päivität työkopiosi, Git luo alikansion D:\\dev\\project1\\sounds ja hakee sinne sounds-projektin, toisen alikansion D:\\dev\\project1\\quick graphs joka sisältää graphs-projektin ja lopuksi upotetun alikansion D:\\dev\\project1\\skins\\toolkit, joka sisältää skin-maker -projektin version 21." #. (para) #: ../source/TortoiseGit_en.xml:3980 @@ -3644,8 +3644,8 @@ msgstr "Jos käytät absoluuttisia paikantimia svn:externals #. (para) #: ../source/TortoiseGit_en.xml:4016 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." -msgstr "Tällaisten ongelmien välttämiseksi Subversion (ja siis myös TortoiseGit) tukee versiosta 1.5 alkaen suhteellisia paikantimia ulkoisissa viitteissä. Suhteellisen paikantimen voi antaa neljällä eri tavalla. Seuraavissa esimerkeissä oletetaan, että käytössä on kaksi arkistoa, http://example.com/svn/repos-1 ja http://example.com/svn/repos-2. Paikantimesta http://example.com/svn/repos-1/project/trunk on noudettu työkopio kansioon C:\\Working ja ominaisuus svn:externals on asetettu kansiolle trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgstr "Tällaisten ongelmien välttämiseksi Git (ja siis myös TortoiseGit) tukee versiosta 1.5 alkaen suhteellisia paikantimia ulkoisissa viitteissä. Suhteellisen paikantimen voi antaa neljällä eri tavalla. Seuraavissa esimerkeissä oletetaan, että käytössä on kaksi arkistoa, http://example.com/svn/repos-1 ja http://example.com/svn/repos-2. Paikantimesta http://example.com/svn/repos-1/project/trunk on noudettu työkopio kansioon C:\\Working ja ominaisuus svn:externals on asetettu kansiolle trunk." #. (term) #: ../source/TortoiseGit_en.xml:4031 @@ -3873,8 +3873,8 @@ msgstr "Toista sama kansiolle Project25." #. (para) #: ../source/TortoiseGit_en.xml:4298 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." -msgstr "Toista sama kansiolle Project76/SubProj. Huomaa tällä kertaa, että kansio Project76 sisältää pelkästään hakemiston SubProj, joka on haettu kokonaisuudessaan. Subversion luo tarvittavat välikansiot automaattisesti." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." +msgstr "Toista sama kansiolle Project76/SubProj. Huomaa tällä kertaa, että kansio Project76 sisältää pelkästään hakemiston SubProj, joka on haettu kokonaisuudessaan. Git luo tarvittavat välikansiot automaattisesti." #. (title) #: ../source/TortoiseGit_en.xml:4308 @@ -3883,8 +3883,8 @@ msgstr "Työkopion syvyyttä ei voi pienentää" #. (para) #: ../source/TortoiseGit_en.xml:4309 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." -msgstr "Kun olet kerran hakenut työkopion tietyllä syvyydellä, voit kasvattaa syvyyttä myöhemmin lisäsisällön saamiseksi. Et kuitenkaan voi pienentää syvyyttä poistaaksesi jo haettua sisältöä. Tällainen ominaisuus saatetaan lisätä Subversioniin tulevaisuudessa." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." +msgstr "Kun olet kerran hakenut työkopion tietyllä syvyydellä, voit kasvattaa syvyyttä myöhemmin lisäsisällön saamiseksi. Et kuitenkaan voi pienentää syvyyttä poistaaksesi jo haettua sisältöä. Tällainen ominaisuus saatetaan lisätä Gitiin tulevaisuudessa." #. (title) #: ../source/TortoiseGit_en.xml:4317 @@ -3919,7 +3919,7 @@ msgstr "Vienti" #. (para) #: ../source/TortoiseGit_en.xml:4359 msgid "Sometimes you may want to create a local copy without any of those .svn directories, e.g. to create a zipped tarball of your source. Read to find out how to do that." -msgstr "Saatat joskus haluta luoda työkopiosta kopion ilman Subversion-metatietoja (.svn-hakemistot), esim. luodaksesi lähdekoodeista zip-paketin. Luvussa kerrotaan, miten se onnistuu." +msgstr "Saatat joskus haluta luoda työkopiosta kopion ilman Git-metatietoja (.svn-hakemistot), esim. luodaksesi lähdekoodeista zip-paketin. Luvussa kerrotaan, miten se onnistuu." #. (title) #: ../source/TortoiseGit_en.xml:4368 @@ -4025,8 +4025,8 @@ msgstr "Alapaneelissa näytetyt sarakkeet ovat mukautettavissa. Kun oike #. (para) #: ../source/TortoiseGit_en.xml:4495 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." -msgstr "Oletusarvoisesti kaikki tiedostolukot vapautuvat onnistuneen toimituksen jälkeen. Jos haluat säilyttää lukot, varmista että valinta Pidä lukot on ruksattu. Valinnan oletusarvo otetaan no_unlock-asetuksesta Subversionin määrittelytiedostossa. Luvussa kerrotaan lisää Subversionin määrittelytiedoston muokkaamisesta." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." +msgstr "Oletusarvoisesti kaikki tiedostolukot vapautuvat onnistuneen toimituksen jälkeen. Jos haluat säilyttää lukot, varmista että valinta Pidä lukot on ruksattu. Valinnan oletusarvo otetaan no_unlock-asetuksesta Gitin määrittelytiedostossa. Luvussa kerrotaan lisää Gitin määrittelytiedoston muokkaamisesta." #. (para) #: ../source/TortoiseGit_en.xml:4506 @@ -4049,8 +4049,8 @@ msgstr "Ulkoisten uudelleen nimentöjen korjaus" #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5347 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Joskus tiedostoja nimetään uudelleen Subversionin ulkopuolella, ja ne näkyvät toimitusikkunassa puuttuvana ja versioimattomana tiedostona. Välttääksesi menettämästä tiedoston historiaa, sinun on kerrottava Subversionille kytkennästä. Voit yksinkertaisesti valita sekä vanhan nimen (puuttuu) ja uuden nimen (versioimaton) sekä käyttää komentoa KontekstivalikkoKorjaa siirto tulkitaksesi tiedostoparin uudelleennimennäksi." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Joskus tiedostoja nimetään uudelleen Gitin ulkopuolella, ja ne näkyvät toimitusikkunassa puuttuvana ja versioimattomana tiedostona. Välttääksesi menettämästä tiedoston historiaa, sinun on kerrottava Gitille kytkennästä. Voit yksinkertaisesti valita sekä vanhan nimen (puuttuu) ja uuden nimen (versioimaton) sekä käyttää komentoa KontekstivalikkoKorjaa siirto tulkitaksesi tiedostoparin uudelleennimennäksi." #. (title) #. (title) @@ -4061,8 +4061,8 @@ msgstr "Muutoslistat" #. (para) #: ../source/TortoiseGit_en.xml:4539 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." -msgstr "Toimitusikkuna tukee Subversionin muutoslistoja, joiden avulla toisiinsa liittyvät tiedostot voi niputtaa yhteen. Ominaisuudesta kerrotaan lisää luvussa ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." +msgstr "Toimitusikkuna tukee Gitin muutoslistoja, joiden avulla toisiinsa liittyvät tiedostot voi niputtaa yhteen. Ominaisuudesta kerrotaan lisää luvussa ." #. (title) #: ../source/TortoiseGit_en.xml:4546 @@ -4350,8 +4350,8 @@ msgstr "Paikallinen tiedosto on jo olemassa" #. (para) #: ../source/TortoiseGit_en.xml:4886 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." -msgstr "Joskus päivitys epäonnistuu ja päättyy virheeseen, jonka mukaan saman niminen paikallinen tiedosto on jo olemassa. Näin tapahtuu tavallisesti silloin, kun Subversion yrittää noutaa vastikään versioidun tiedoston, ja havaitsee, että työkopiossasi on saman niminen, versioimaton tiedosto. Subversion ei koskaan ylikirjoita versioimatonta tiedostoa - se saattaa sisältää jotain, joka sinulla on työn alla, ja jolla vain sattumoisin on sama nimi kuin jonkun toisen kehittäjän toimittamalla tiedostolla." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgstr "Joskus päivitys epäonnistuu ja päättyy virheeseen, jonka mukaan saman niminen paikallinen tiedosto on jo olemassa. Näin tapahtuu tavallisesti silloin, kun Git yrittää noutaa vastikään versioidun tiedoston, ja havaitsee, että työkopiossasi on saman niminen, versioimaton tiedosto. Git ei koskaan ylikirjoita versioimatonta tiedostoa - se saattaa sisältää jotain, joka sinulla on työn alla, ja jolla vain sattumoisin on sama nimi kuin jonkun toisen kehittäjän toimittamalla tiedostolla." #. (para) #: ../source/TortoiseGit_en.xml:4895 @@ -4400,27 +4400,27 @@ msgstr "tiedostonimi.rUUSIVERSIO" #. (para) #: ../source/TortoiseGit_en.xml:4965 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." -msgstr "Tämä on se tiedosto, jonka Subversion-asiakas vastaanotti palvelimelta kun päivitit työkopiosi. Tämä tiedosto vastaa arkiston uusinta (HEAD) versiota." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgstr "Tämä on se tiedosto, jonka Git-asiakas vastaanotti palvelimelta kun päivitit työkopiosi. Tämä tiedosto vastaa arkiston uusinta (HEAD) versiota." #. (para) #: ../source/TortoiseGit_en.xml:4920 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" -"Silloin tällöin törmäät ristiriitaan koettaessasi päivittää tiedostojasi arkistosta. Ristiriita syntyy, kun useat kehittäjät ovat muuttaneet samoja rivejä jossain versioidussa tiedostossa. Koska Subversion ei tiedä mitään projektistasi, se jättää ristiriitojen ratkaisun kehittäjille. Aina kun ristiriitasta kerrotaan, sinun tulisi avata kyseinen tiedosto ja etsiä rivejä, jotka alkavat merkkijonolla <<<<<<<. Ristiriitainen tekstipätkä on merkitty näin: \n" +"Silloin tällöin törmäät ristiriitaan koettaessasi päivittää tiedostojasi arkistosta. Ristiriita syntyy, kun useat kehittäjät ovat muuttaneet samoja rivejä jossain versioidussa tiedostossa. Koska Git ei tiedä mitään projektistasi, se jättää ristiriitojen ratkaisun kehittäjille. Aina kun ristiriitasta kerrotaan, sinun tulisi avata kyseinen tiedosto ja etsiä rivejä, jotka alkavat merkkijonolla <<<<<<<. Ristiriitainen tekstipätkä on merkitty näin: \n" "<<<<<<< tiedosto\n" " sinun muutoksesi\n" "=======\n" " arkistosta liitetty koodi\n" ">>>>>>> versio\n" -" Subversion tallettaa lisäksi kolme ylimääräistä tiedostoa hakemistoosi: " +" Git tallettaa lisäksi kolme ylimääräistä tiedostoa hakemistoosi: " #. (para) #: ../source/TortoiseGit_en.xml:4975 @@ -4434,8 +4434,8 @@ msgstr "Suorita lopuksi komento TortoiseGitfilename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." -msgstr "Jos sinulla on ristiriitoja binääritiedostojen kanssa, Subversion ei yritä yhdistää tiedostoja itse. Paikallinen tiedosto säilyy muuttumattomana (täsmälleen sellaisena, kuin viimeksi muuttaessasi sitä) ja työkopioosi luodaan tiedostonimi.r* -tiedostot. Jos haluat perua muutoksesi ja pitää arkistoversion, käytä komentoa Palauta. Jos haluat pitää oman versiosi ja ylikirjoittaa arkiston version, käytä komentoa Merkitse ratkaistuksi ja toimita sen jälkeen oma versiosi arkistoon." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgstr "Jos sinulla on ristiriitoja binääritiedostojen kanssa, Git ei yritä yhdistää tiedostoja itse. Paikallinen tiedosto säilyy muuttumattomana (täsmälleen sellaisena, kuin viimeksi muuttaessasi sitä) ja työkopioosi luodaan tiedostonimi.r* -tiedostot. Jos haluat perua muutoksesi ja pitää arkistoversion, käytä komentoa Palauta. Jos haluat pitää oman versiosi ja ylikirjoittaa arkiston version, käytä komentoa Merkitse ratkaistuksi ja toimita sen jälkeen oma versiosi arkistoon." #. (para) #: ../source/TortoiseGit_en.xml:5009 @@ -4483,13 +4483,13 @@ msgstr "kuvakkeet" #. (para) #: ../source/TortoiseGit_en.xml:5051 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "Haettuasi työkopion Subversion-arkistosta näet tiedostosi Windows-resurssienhallinnassa erilaisin kuvakkein. Tämä on eräs syy siihen, miksi TortoiseGit on niin suosittu. TortoiseGit lisää ns. kuvakepäällyksen jokaisen versioidun tiedoston oman kuvakkeen päälle. Riippuen tiedoston Subversion-tilasta päällys on erilainen." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." +msgstr "Haettuasi työkopion Git-arkistosta näet tiedostosi Windows-resurssienhallinnassa erilaisin kuvakkein. Tämä on eräs syy siihen, miksi TortoiseGit on niin suosittu. TortoiseGit lisää ns. kuvakepäällyksen jokaisen versioidun tiedoston oman kuvakkeen päälle. Riippuen tiedoston Git-tilasta päällys on erilainen." #. (para) #: ../source/TortoiseGit_en.xml:5059 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " Juuri haettu työkopion tiedoston kuvakepäällys on vihreä ruksi. Subversion-tila on normaali." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " Juuri haettu työkopion tiedoston kuvakepäällys on vihreä ruksi. Git-tila on normaali." #. (para) #: ../source/TortoiseGit_en.xml:5064 @@ -4503,13 +4503,13 @@ msgstr " Jos päivityksen aikan #. (para) #: ../source/TortoiseGit_en.xml:5077 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." -msgstr " Jos olet asettanut svn:needs-lock -ominaisuuden tiedostolle, Subversion poistaa kirjoitusoikeudet tiedostoon kunnes lukitset sen. Tällaisilla tiedostoilla on kuvakepäällys, joka kertoo, että tiedosto on lukittava ennen kuin sitä voi muokata." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgstr " Jos olet asettanut svn:needs-lock -ominaisuuden tiedostolle, Git poistaa kirjoitusoikeudet tiedostoon kunnes lukitset sen. Tällaisilla tiedostoilla on kuvakepäällys, joka kertoo, että tiedosto on lukittava ennen kuin sitä voi muokata." #. (para) #: ../source/TortoiseGit_en.xml:5084 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." -msgstr " Jos olet lukinnut tiedoston, ja Subversion-tila on normaali, tämä kuvakepäällys muistuttaa, että jos et aio muuttaa sitä, sinun tulee vapauttaa lukko salliaksesi muitten muutokset." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgstr " Jos olet lukinnut tiedoston, ja Git-tila on normaali, tämä kuvakepäällys muistuttaa, että jos et aio muuttaa sitä, sinun tulee vapauttaa lukko salliaksesi muitten muutokset." #. (para) #: ../source/TortoiseGit_en.xml:5091 @@ -4543,8 +4543,8 @@ msgstr "Nyt kun Tortoise-tyyppisiä ohjelmia on useita (TortoiseCVS, TortoiseHG, #. (para) #: ../source/TortoiseGit_en.xml:5129 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." -msgstr "Lisätietoa siitä, miten kuvakepäällykset vastaavat Subversion-tiloja sekä muita teknisiä yksityiskohtia löytyy luvusta ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." +msgstr "Lisätietoa siitä, miten kuvakepäällykset vastaavat Git-tiloja sekä muita teknisiä yksityiskohtia löytyy luvusta ." #. (title) #: ../source/TortoiseGit_en.xml:5136 @@ -4980,8 +4980,8 @@ msgstr "Kopioi valittujen versioiden lokiviestit leikepöydälle. Komento kopioi #. (para) #: ../source/TortoiseGit_en.xml:5752 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." -msgstr "Etsii lokiviesteistä syöttämääsi tekstiä. Komento läy läpi syöttämäsi lokiviestit samoin kuin Subversionin luomat toimintoyhteenvedot (näkyvissä alapaneelissa). Komennon suoritus ei riipu merkkien tasosta." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." +msgstr "Etsii lokiviesteistä syöttämääsi tekstiä. Komento läy läpi syöttämäsi lokiviestit samoin kuin Gitin luomat toimintoyhteenvedot (näkyvissä alapaneelissa). Komennon suoritus ei riipu merkkien tasosta." #. (para) #: ../source/TortoiseGit_en.xml:5591 @@ -5067,8 +5067,8 @@ msgstr "Peru työkopiosta valitussa tiedostoversiossa tehdyt muutokset." #. (para) #: ../source/TortoiseGit_en.xml:5853 -msgid "View the Subversion properties for the selected item." -msgstr "Näytä Subversion-ominaisuudet valitulle kohteelle." +msgid "View the Git properties for the selected item." +msgstr "Näytä Git-ominaisuudet valitulle kohteelle." #. (para) #: ../source/TortoiseGit_en.xml:5858 @@ -5092,17 +5092,17 @@ msgstr "Olet ehkä huomannut, että joskus viittaamme muutoksiin ja joskus eroih #. (para) #: ../source/TortoiseGit_en.xml:5875 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." -msgstr "Subversion käyttää versionumeroita tarkoittamaan kahta eri asiaa. Yleensä versio kuvaa arkiston tilaa tietyllä ajan hetkellä, mutta sitä voidaan myös käyttää kuvaamaan sitä muutosjoukkoa, jolla versio luotiin, esim. X tehty versiossa r1234 tarkoittaa, että versiossa 1234 toimitetut muutokset toteuttavat ominaisuuden X. Tehdäksemme selväksi, kumpaa asiaa tarkoitetaan, käytämme kahta eri termiä." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgstr "Git käyttää versionumeroita tarkoittamaan kahta eri asiaa. Yleensä versio kuvaa arkiston tilaa tietyllä ajan hetkellä, mutta sitä voidaan myös käyttää kuvaamaan sitä muutosjoukkoa, jolla versio luotiin, esim. X tehty versiossa r1234 tarkoittaa, että versiossa 1234 toimitetut muutokset toteuttavat ominaisuuden X. Tehdäksemme selväksi, kumpaa asiaa tarkoitetaan, käytämme kahta eri termiä." #. (para) #: ../source/TortoiseGit_en.xml:5884 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." -msgstr "Jos valitset kaksi versiota N ja M, kontekstivalikossa on komento, joka näyttää erot versioiden välillä. Subversion-termein tämä ilmaistaan diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." +msgstr "Jos valitset kaksi versiota N ja M, kontekstivalikossa on komento, joka näyttää erot versioiden välillä. Git-termein tämä ilmaistaan diff -r M:N." #. (para) #: ../source/TortoiseGit_en.xml:5890 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "Jos valitset yksittäisen version N, kontekstivalikossa on komento, joka näyttää versiossa tehdyt muutokset." #. (para) @@ -5137,8 +5137,8 @@ msgstr "Kun loki avataan yhdistämiskomennon aikana, valinta on aina oletusarvoi #. (para) #: ../source/TortoiseGit_en.xml:5945 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." -msgstr "Huomaa, että uudelleennimentä on nykyään toteutettu Subversionissa kopioi/poista -komentoparina, joten tiedoston tai kansion nimeäminen uudelleen pysäyttää myös lokin, jos tämä valinta on aktiivinen." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgstr "Huomaa, että uudelleennimentä on nykyään toteutettu Gitissa kopioi/poista -komentoparina, joten tiedoston tai kansion nimeäminen uudelleen pysäyttää myös lokin, jos tämä valinta on aktiivinen." #. (para) #: ../source/TortoiseGit_en.xml:5904 @@ -5192,8 +5192,8 @@ msgstr "loki tehdyistä yhdistämisistä" #. (para) #: ../source/TortoiseGit_en.xml:6000 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." -msgstr "Subversion 1.5 ja uudemmat versiot pitävät kirjaa tehdyistä yhdistämisistä ominaisuuksien avulla. Tämän ansiosta yhdistämisistä saadaan tarkempaa historiatietoa kuin aiemmin. Jos esimerkiksi kehität uuden ominaisuuden haarassa ja yhdistät sen sitten päähaaraan, ominaisuuden kehitysloki näkyy päähaaran lokissa vain yhtenä toimituksena (tehty yhdistäminen), vaikka haarassa on saattanut olla satoja arkistotoimituksia ominaisuuden kehityksen aikana." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgstr "Git 1.5 ja uudemmat versiot pitävät kirjaa tehdyistä yhdistämisistä ominaisuuksien avulla. Tämän ansiosta yhdistämisistä saadaan tarkempaa historiatietoa kuin aiemmin. Jos esimerkiksi kehität uuden ominaisuuden haarassa ja yhdistät sen sitten päähaaraan, ominaisuuden kehitysloki näkyy päähaaran lokissa vain yhtenä toimituksena (tehty yhdistäminen), vaikka haarassa on saattanut olla satoja arkistotoimituksia ominaisuuden kehityksen aikana." #. (title) #: ../source/TortoiseGit_en.xml:6009 @@ -5227,8 +5227,8 @@ msgstr "Joskus saatat haluta muuttaa aimmin syöttämääsi lokiviestiä, ehkäp #. (para) #: ../source/TortoiseGit_en.xml:6041 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." -msgstr "Subversion sallii sekä lokiviestin että teikijätietojen muuttamisen milloin vain. Mutta koska tällaisia muutoksia ei voi perua (muutokset eivät versioidu), ominaisuus on oletusarvoisesti estetty. Salliaksesi sen sinun on määriteltävä pre-revprop-change -komentosarja. Katso lisätietoa Subversion-kirjan kappaleesta Hook Scripts. Luvussa on tietoa komentosarjojen ottamisesta käyttöön Windows-käyttöjärjestelmässä." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgstr "Git sallii sekä lokiviestin että teikijätietojen muuttamisen milloin vain. Mutta koska tällaisia muutoksia ei voi perua (muutokset eivät versioidu), ominaisuus on oletusarvoisesti estetty. Salliaksesi sen sinun on määriteltävä pre-revprop-change -komentosarja. Katso lisätietoa Git-kirjan kappaleesta Hook Scripts. Luvussa on tietoa komentosarjojen ottamisesta käyttöön Windows-käyttöjärjestelmässä." #. (para) #: ../source/TortoiseGit_en.xml:6054 @@ -5237,8 +5237,8 @@ msgstr "Määriteltyäsi tarpeelliset komentosarjat palvelimellasi voit muuttaa #. (para) #: ../source/TortoiseGit_en.xml:6061 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." -msgstr "Koska Subversionin versio-ominaisuudet eivät itse versioidu, tällaiset muutokset (esim. toimitusviestin ominaisuus svn:log) hävittävät ominaisuuden edellisen arvon pysyvästi." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgstr "Koska Gitin versio-ominaisuudet eivät itse versioidu, tällaiset muutokset (esim. toimitusviestin ominaisuus svn:log) hävittävät ominaisuuden edellisen arvon pysyvästi." #. (title) #: ../source/TortoiseGit_en.xml:6071 @@ -5287,8 +5287,8 @@ msgstr "Lokiviestien muotoilu ei ole käytettävissä arkistoselaimessa" #. (para) #: ../source/TortoiseGit_en.xml:6129 -msgid "Because the formatting depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." -msgstr "Koska lokiviestien muotoilu vaatii Subversion-ominaisuuksien käyttöä, näet tulokset vain työkopion kautta. Ominaisuuksien haku palvelimelta on hidasta, joten tämä toiminto ei ole käytettävissä arkistoselaimessa." +msgid "Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgstr "Koska lokiviestien muotoilu vaatii Git-ominaisuuksien käyttöä, näet tulokset vain työkopion kautta. Ominaisuuksien haku palvelimelta on hidasta, joten tämä toiminto ei ole käytettävissä arkistoselaimessa." #. (title) #: ../source/TortoiseGit_en.xml:6139 @@ -5506,8 +5506,8 @@ msgstr "Erot työkopion tiedoston/kansion ja paikantimen välillä" #. (para) #: ../source/TortoiseGit_en.xml:6392 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." -msgstr "Jos haluat verrata työkopiosi tiedostoa tiedostoon jossain Subversion-arkistossa, voit tehdä niin suoraan Resurssienhallinnasta valitsemalla tiedoston ja pitämällä pohjassa Shift-näppäintä samalla kuin avaat kontekstivalikon hiiren oikealla näppäimellä. Anna lopuksi komento TortoiseGitVertaa paikantimen kanssa. Voit tehdä saman asian työkopion työkopion kansiolle. TortoiseMergenäyttää erot samaan tapaan kuin paikkatiedoston - luettelona muuttuneista tiedostoista, joita voit katsella yksi kerrallaan." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgstr "Jos haluat verrata työkopiosi tiedostoa tiedostoon jossain Git-arkistossa, voit tehdä niin suoraan Resurssienhallinnasta valitsemalla tiedoston ja pitämällä pohjassa Shift-näppäintä samalla kuin avaat kontekstivalikon hiiren oikealla näppäimellä. Anna lopuksi komento TortoiseGitVertaa paikantimen kanssa. Voit tehdä saman asian työkopion työkopion kansiolle. TortoiseMergenäyttää erot samaan tapaan kuin paikkatiedoston - luettelona muuttuneista tiedostoista, joita voit katsella yksi kerrallaan." #. (term) #: ../source/TortoiseGit_en.xml:6410 @@ -5906,8 +5906,8 @@ msgstr "merkki" #. (para) #: ../source/TortoiseGit_en.xml:6853 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." -msgstr "Usein käy, että sinulla on jo tarvitsemasi tiedostot jossain arkistosi toisessa projektissa, ja haluat vain kopioida ne uuteen projektiin. Voisit yksinkertaisesti kopioida tiedostot työkopioosi ja lisätä ne, mutta tällöin menetät muutoshistorian. Ja jos korjaat myöhemmin virheen alkuperäisissä tiedostoissa, voit yhdistää korjauksen automaattisesti vain, jos uusi kopio on suhteessa vanhaan Subversion-arkistossa." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." +msgstr "Usein käy, että sinulla on jo tarvitsemasi tiedostot jossain arkistosi toisessa projektissa, ja haluat vain kopioida ne uuteen projektiin. Voisit yksinkertaisesti kopioida tiedostot työkopioosi ja lisätä ne, mutta tällöin menetät muutoshistorian. Ja jos korjaat myöhemmin virheen alkuperäisissä tiedostoissa, voit yhdistää korjauksen automaattisesti vain, jos uusi kopio on suhteessa vanhaan Git-arkistossa." #. (para) #: ../source/TortoiseGit_en.xml:6861 @@ -5991,8 +5991,8 @@ msgstr "Yleinen ohituslista" #. (para) #: ../source/TortoiseGit_en.xml:6985 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." -msgstr "Toinen tapa ohittaa tiedostoja on lisätä ne yleiseen ohituslistaan. Suuri ero tässä on se, että yleinen ohituslista on asiakaspään ominaisuus. Se koskee kaikkia Subversion-projekteja, mutta vain yhdessä työasemassa. Yleisesti ottaen on parempi käyttää svn:ignore-ominaisuutta, mikäli mahdollista, koska sitä voidaan käyttää projektin valittuihin osa-alueisiin, ja se toimii yhtäläisesti kaikille, jotka ottavat projektista työkopion. Luvussa on lisätietoa asetuksesta." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgstr "Toinen tapa ohittaa tiedostoja on lisätä ne yleiseen ohituslistaan. Suuri ero tässä on se, että yleinen ohituslista on asiakaspään ominaisuus. Se koskee kaikkia Git-projekteja, mutta vain yhdessä työasemassa. Yleisesti ottaen on parempi käyttää svn:ignore-ominaisuutta, mikäli mahdollista, koska sitä voidaan käyttää projektin valittuihin osa-alueisiin, ja se toimii yhtäläisesti kaikille, jotka ottavat projektista työkopion. Luvussa on lisätietoa asetuksesta." #. (title) #: ../source/TortoiseGit_en.xml:6998 @@ -6001,8 +6001,8 @@ msgstr "Versioitujen kohteiden ohittaminen" #. (para) #: ../source/TortoiseGit_en.xml:6999 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." -msgstr "Versioituja tiedostoja ja kansioita ei voi koskaan ohittaa - tämä on Subversionin ominaisuus. Jos versioit tiedoston vahingossa, lue luvusta ohjeet, kuinka poistaa sen versiointi." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." +msgstr "Versioituja tiedostoja ja kansioita ei voi koskaan ohittaa - tämä on Gitin ominaisuus. Jos versioit tiedoston vahingossa, lue luvusta ohjeet, kuinka poistaa sen versiointi." #. (title) #: ../source/TortoiseGit_en.xml:7007 @@ -6051,8 +6051,8 @@ msgstr "Täsmää yhden hakasuluissa olevista merkeistä. Hakasulkujen sisällä #. (para) #: ../source/TortoiseGit_en.xml:7014 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " -msgstr "Subversionin ohituslausekkeet hyödyntävät tiedostonimien yleistystä (globbing), alun perin Unixista lähtöisin olevaa tekniikkaa, jonka avulla tiedostonimet yleistetään käyttäen erikoismerkkejä: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgstr "Gitin ohituslausekkeet hyödyntävät tiedostonimien yleistystä (globbing), alun perin Unixista lähtöisin olevaa tekniikkaa, jonka avulla tiedostonimet yleistetään käyttäen erikoismerkkejä: " #. (para) #: ../source/TortoiseGit_en.xml:7054 @@ -6086,8 +6086,8 @@ msgstr "Resurssienhallinnan kontekstivalikko versioiduille tiedostoille" #. (para) #: ../source/TortoiseGit_en.xml:7089 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " -msgstr "Toisin kuin CVS, Subversion sallii tiedostojen ja kansioiden uudelleen nimeämisen ja siirtelyn. Tästä syystä TortoiseGit-alivalikossa on komennot poistamista ja uudelleen nimeämistä varten. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgstr "Toisin kuin CVS, Git sallii tiedostojen ja kansioiden uudelleen nimeämisen ja siirtelyn. Tästä syystä TortoiseGit-alivalikossa on komennot poistamista ja uudelleen nimeämistä varten. " #. (title) #: ../source/TortoiseGit_en.xml:7099 @@ -6106,7 +6106,7 @@ msgstr "tuhoaminen" #. (para) #: ../source/TortoiseGit_en.xml:7106 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "Käytä komentoa TortoiseGitPoista poistaaksesi tiedostoja tai kansioita arkistosta." #. (para) @@ -6116,8 +6116,8 @@ msgstr "Kun poistat tiedoston komennolla TortoiseGitTortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." -msgstr "Kun suoritat komennon TortoiseGitPoista kansiolle, se säilyy työkopiossasi, mutta sen kuvakepäällys muuttuu osoittamaan, että kansio on merkitty poistettavaksi. Seuraavaan arkistotoimitukseen saakka voit saada kansion takaisin suorittamalla komennon TortoiseGitPalauta kansiolle itselleen. Tämä ero toiminnallisuudessa tiedostojen ja kansioiden välillä on Subversionin ominaisuus, ei TortoiseGit:n." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." +msgstr "Kun suoritat komennon TortoiseGitPoista kansiolle, se säilyy työkopiossasi, mutta sen kuvakepäällys muuttuu osoittamaan, että kansio on merkitty poistettavaksi. Seuraavaan arkistotoimitukseen saakka voit saada kansion takaisin suorittamalla komennon TortoiseGitPalauta kansiolle itselleen. Tämä ero toiminnallisuudessa tiedostojen ja kansioiden välillä on Gitin ominaisuus, ei TortoiseGit:n." #. (para) #: ../source/TortoiseGit_en.xml:7147 @@ -6126,13 +6126,13 @@ msgstr "Jos haluat poistaa kohteen arkistosta, mutta säilyttää sen paikallis #. (para) #: ../source/TortoiseGit_en.xml:7158 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." -msgstr "Jos tiedosto poistetaan Resurssienhallinnan avulla käyttämättä TortoiseGit-kontekstivalikkoa, toimitusikkuna näyttää sen ja sallii niiden poiston versiohallinnasta ennen toimitusta. Kuitenkin, jos päivität työkopiotasi, Subversion havaitsee puuttuvan tiedoston ja korvaa sen viimeisimmällä arkistoversiolla. Jos joudut poistamaan versioidun tiedoston, käytä aina komentoa TortoiseGitPoista jotta Subversionin ei tarvitse arvata, mitä todella haluat tehdä." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." +msgstr "Jos tiedosto poistetaan Resurssienhallinnan avulla käyttämättä TortoiseGit-kontekstivalikkoa, toimitusikkuna näyttää sen ja sallii niiden poiston versiohallinnasta ennen toimitusta. Kuitenkin, jos päivität työkopiotasi, Git havaitsee puuttuvan tiedoston ja korvaa sen viimeisimmällä arkistoversiolla. Jos joudut poistamaan versioidun tiedoston, käytä aina komentoa TortoiseGitPoista jotta Gitin ei tarvitse arvata, mitä todella haluat tehdä." #. (para) #: ../source/TortoiseGit_en.xml:7172 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." -msgstr "Jos poistat kansion Resurssienhallinnan kautta käyttämättä TortoiseGit-kontekstivalikkoa, työkopiosi menee rikki ja et pysty toimittamaan mitään arkistoon. Jos päivität työkopiosi, Subversion korvaa puuttuvan kansion viimeisimmällä arkistoversiolla. Tämän jälkeen voit poistaa sen oikein komennolla TortoiseGitPoista." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgstr "Jos poistat kansion Resurssienhallinnan kautta käyttämättä TortoiseGit-kontekstivalikkoa, työkopiosi menee rikki ja et pysty toimittamaan mitään arkistoon. Jos päivität työkopiosi, Git korvaa puuttuvan kansion viimeisimmällä arkistoversiolla. Tämän jälkeen voit poistaa sen oikein komennolla TortoiseGitPoista." #. (title) #: ../source/TortoiseGit_en.xml:7185 @@ -6225,13 +6225,13 @@ msgstr "merkkitason muutos" #. (para) #: ../source/TortoiseGit_en.xml:7301 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." -msgstr "Versioitujen tiedostojen nimen muuttaminen pelkästään merkkien tason osalta on hankalaa Windowsissa, koska Windowsin tiedostojärjestelmä ei, toisin kuin Subversion, välitä merkkien tasosta. Tavallinen \"Nimeä uudelleen\"-komento ei toimi." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgstr "Versioitujen tiedostojen nimen muuttaminen pelkästään merkkien tason osalta on hankalaa Windowsissa, koska Windowsin tiedostojärjestelmä ei, toisin kuin Git, välitä merkkien tasosta. Tavallinen \"Nimeä uudelleen\"-komento ei toimi." #. (para) #: ../source/TortoiseGit_en.xml:7307 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" -msgstr "Onneksi on (ainakin) kaksi tapaa nimetä tiedosto uudelleen menettämättä sen lokia. On tärkeää suorittaa uudelleennimentä Subversion-komennolla. Pelkästään Resurssienhallinnassa tehty uudelleen nimentä sotkee työkopiosi!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" +msgstr "Onneksi on (ainakin) kaksi tapaa nimetä tiedosto uudelleen menettämättä sen lokia. On tärkeää suorittaa uudelleennimentä Git-komennolla. Pelkästään Resurssienhallinnassa tehty uudelleen nimentä sotkee työkopiosi!" #. (para) #: ../source/TortoiseGit_en.xml:7317 @@ -6282,8 +6282,8 @@ msgstr "Tiedostonimien merkkitaso-ongelmien ratkaisu" #. (para) #: ../source/TortoiseGit_en.xml:7363 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." -msgstr "Jos arkisto sisältää jo kaksi tiedostoa, joilla on sama nimi, mutta eri merkkitasot (esim. TEST.TXT ja test.txt), et pysty päivittämään tai hakemaan työkopiota tiedostot sisältävästä arkiston hakemistosta Windows-ympäristössä. Vaikka Subversion tukee merkkitasosta riippuvia tiedostonimiä, Windows ei sitä tee." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." +msgstr "Jos arkisto sisältää jo kaksi tiedostoa, joilla on sama nimi, mutta eri merkkitasot (esim. TEST.TXT ja test.txt), et pysty päivittämään tai hakemaan työkopiota tiedostot sisältävästä arkiston hakemistosta Windows-ympäristössä. Vaikka Git tukee merkkitasosta riippuvia tiedostonimiä, Windows ei sitä tee." #. (para) #: ../source/TortoiseGit_en.xml:7371 @@ -6312,13 +6312,13 @@ msgstr "Tiedostojen uudelleen nimeämisten korjaaminen" #. (para) #: ../source/TortoiseGit_en.xml:7395 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." -msgstr "Joskus käy niin, että ystävällinen kehitysympäristösi nimeää tiedostoja puolestasi uudestaan esim. osana ohjelman uudelleenjärjestelyä (refactoring), eikä tietenkään kerro tästä Subversionille. Jos päätät toimittaa muutoksesi arkistoon tässä tilanteessa, Subversion tulkitsee, että vanha tiedosto puuttuu ja uusi on versioimaton. Voisit tietenkin ruksata uuden tiedoston saadaksesi sen lisätyksi, mutta menettäisit silloin lokihistorian, koska Subversion ei tiedä, että tiedostot liittyvät toisiinsa." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." +msgstr "Joskus käy niin, että ystävällinen kehitysympäristösi nimeää tiedostoja puolestasi uudestaan esim. osana ohjelman uudelleenjärjestelyä (refactoring), eikä tietenkään kerro tästä Gitille. Jos päätät toimittaa muutoksesi arkistoon tässä tilanteessa, Git tulkitsee, että vanha tiedosto puuttuu ja uusi on versioimaton. Voisit tietenkin ruksata uuden tiedoston saadaksesi sen lisätyksi, mutta menettäisit silloin lokihistorian, koska Git ei tiedä, että tiedostot liittyvät toisiinsa." #. (para) #: ../source/TortoiseGit_en.xml:7403 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Parempi keino ratkaista asia on kertoa Subversionille, että kyseessä on oikeastaan uudelleen nimeäminen. Voit tehdä tämän sekä Toimita että Tarkista muutokset -ikkunoista: valitse sekä vanha (puuttuva) ja uusi (versioimaton) nimi sekä anna komento KontekstivalikkoKorjaa siirto parittaaksesi tiedostot uudelleennimennäksi." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Parempi keino ratkaista asia on kertoa Gitille, että kyseessä on oikeastaan uudelleen nimeäminen. Voit tehdä tämän sekä Toimita että Tarkista muutokset -ikkunoista: valitse sekä vanha (puuttuva) ja uusi (versioimaton) nimi sekä anna komento KontekstivalikkoKorjaa siirto parittaaksesi tiedostot uudelleennimennäksi." #. (title) #: ../source/TortoiseGit_en.xml:7417 @@ -6327,8 +6327,8 @@ msgstr "Versioimattomien tiedostojen poisto" #. (para) #: ../source/TortoiseGit_en.xml:7418 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." -msgstr "Tavallisesti ohituslista kannattaa asettaa niin, että kaikki tuotetut tiedostot ohitetaan Subversionissa. Mutta entäpä jos haluat poistaa kaikki ohitetut kohteet esim. rakentaaksesi sovelluksen alusta uudelleen? Tavallisesti tällainen tehdään makefile-tiedostolla tai kehitysympäristön komennolla, mutta joskus tämä ei ole mahdollista, joten on hyödyllistä pystyä nollaamaan tilanne muutenkin." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgstr "Tavallisesti ohituslista kannattaa asettaa niin, että kaikki tuotetut tiedostot ohitetaan Gitissa. Mutta entäpä jos haluat poistaa kaikki ohitetut kohteet esim. rakentaaksesi sovelluksen alusta uudelleen? Tavallisesti tällainen tehdään makefile-tiedostolla tai kehitysympäristön komennolla, mutta joskus tämä ei ole mahdollista, joten on hyödyllistä pystyä nollaamaan tilanne muutenkin." #. (para) #: ../source/TortoiseGit_en.xml:7425 @@ -6422,13 +6422,13 @@ msgstr "siivoaminen" #. (para) #: ../source/TortoiseGit_en.xml:7520 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." -msgstr "Mikäli jotain Subversion-komentoa ei saada päätettyä onnistuneesti (esim. johtuen palvelimen ongelmista), työkopiosi voi jäädä epäyhtenäiseen tilaan. Tällöin sinun on käytettävä komentoa TortoiseGitSiivoa. On suositeltavaa tehdä tämä koko työkopiolle antamalla komento työkopion juurikansiosta." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgstr "Mikäli jotain Git-komentoa ei saada päätettyä onnistuneesti (esim. johtuen palvelimen ongelmista), työkopiosi voi jäädä epäyhtenäiseen tilaan. Tällöin sinun on käytettävä komentoa TortoiseGitSiivoa. On suositeltavaa tehdä tämä koko työkopiolle antamalla komento työkopion juurikansiosta." #. (para) #: ../source/TortoiseGit_en.xml:7531 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." -msgstr "Siivoamisella on toinen hyödyllinen sivuvaikutus. Jos tiedoston päiväys muuttuu, mutta sisältö ei, Subversion ei tiedä, onko se todella muuttunut vertaamatta tiedostoa tavu tavulta alkuperäiseen versioon. Jos tällaisia tiedostoja on paljon, tilatietojen haku hidastuu ja monet komennot vaikuttavat hitailta. Siivoa-komennon suoritus korjaa nämä rikkinäiset aikaleimat ja sallii tilatietojen haun täydellä vauhdilla." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgstr "Siivoamisella on toinen hyödyllinen sivuvaikutus. Jos tiedoston päiväys muuttuu, mutta sisältö ei, Git ei tiedä, onko se todella muuttunut vertaamatta tiedostoa tavu tavulta alkuperäiseen versioon. Jos tällaisia tiedostoja on paljon, tilatietojen haku hidastuu ja monet komennot vaikuttavat hitailta. Siivoa-komennon suoritus korjaa nämä rikkinäiset aikaleimat ja sallii tilatietojen haun täydellä vauhdilla." #. (title) #: ../source/TortoiseGit_en.xml:7542 @@ -6437,8 +6437,8 @@ msgstr "Käytä toimitusaikaleimoja" #. (para) #: ../source/TortoiseGit_en.xml:7543 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." -msgstr "Joissain aiemmissa Subversion-versioissa oli virhe, joka rikkoi aikaleimat, jos asetus Aseta päiväykset viimeisimpään arkistoon toimitusaikaan oli päällä työkopiota haettaessa. Siivoa-komento nopeuttaa tällaisten työkopioiden käyttöä." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgstr "Joissain aiemmissa Git-versioissa oli virhe, joka rikkoi aikaleimat, jos asetus Aseta päiväykset viimeisimpään arkistoon toimitusaikaan oli päällä työkopiota haettaessa. Siivoa-komento nopeuttaa tällaisten työkopioiden käyttöä." #. (title) #: ../source/TortoiseGit_en.xml:7553 @@ -6452,38 +6452,38 @@ msgstr "ominaisuudet" #. (title) #: ../source/TortoiseGit_en.xml:7559 -msgid "Explorer property page, Subversion tab" -msgstr "Resurssienhallinnan ominaisuudet, Subversion-sivu" +msgid "Explorer property page, Git tab" +msgstr "Resurssienhallinnan ominaisuudet, Git-sivu" #. (para) #: ../source/TortoiseGit_en.xml:7557 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." -msgstr " Joskus on tarpeen saada yksityiskohtaisempaa tietoa tiedostosta/kansiosta kuin mitä pelkkä kuvakepäällys tarjoaa. Nämä tiedot löytyvät Resurssienhallinnan ominaisuuksien Subversion-sivulta. Valitse tiedosto tai kansio ja anna komento Windows-valikkoOminaisuudet kontekstivalikossa (huomaa: tämä on Resurssienhallinnan tavallinen Ominaisuudet-komento, ei TortoiseGit-alivalikosta löytyvä!). Ominaisuudet-ikkunassa on TortoiseGit:n lisäämä sivu versioiduille tiedostoille/kansioille, jossa näet kaikki oleelliset tiedot." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." +msgstr " Joskus on tarpeen saada yksityiskohtaisempaa tietoa tiedostosta/kansiosta kuin mitä pelkkä kuvakepäällys tarjoaa. Nämä tiedot löytyvät Resurssienhallinnan ominaisuuksien Git-sivulta. Valitse tiedosto tai kansio ja anna komento Windows-valikkoOminaisuudet kontekstivalikossa (huomaa: tämä on Resurssienhallinnan tavallinen Ominaisuudet-komento, ei TortoiseGit-alivalikosta löytyvä!). Ominaisuudet-ikkunassa on TortoiseGit:n lisäämä sivu versioiduille tiedostoille/kansioille, jossa näet kaikki oleelliset tiedot." #. (title) #: ../source/TortoiseGit_en.xml:7579 -msgid "Subversion Properties" -msgstr "Subversion-ominaisuudet" +msgid "Git Properties" +msgstr "Git-ominaisuudet" #. (primary) #: ../source/TortoiseGit_en.xml:7581 -msgid "Subversion properties" -msgstr "Subversion-ominaisuudet" +msgid "Git properties" +msgstr "Git-ominaisuudet" #. (title) #: ../source/TortoiseGit_en.xml:7587 -msgid "Subversion property page" -msgstr "Subversion ominaisuussivu" +msgid "Git property page" +msgstr "Git ominaisuussivu" #. (para) #: ../source/TortoiseGit_en.xml:7585 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." -msgstr " Voit katsoa ja asettaa Subversion-ominaisuuksia Resurssienhallinnan ominaisuusikkunasta, mutta se onnistuu myös TortoiseGit-alivalikosta, TortoiseGitOminaisuudet." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgstr " Voit katsoa ja asettaa Git-ominaisuuksia Resurssienhallinnan ominaisuusikkunasta, mutta se onnistuu myös TortoiseGit-alivalikosta, TortoiseGitOminaisuudet." #. (para) #: ../source/TortoiseGit_en.xml:7602 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." -msgstr "Voit lisätä omia ominaisuuksiasi tai tiettyjä ominaisuuksia, joilla on erityismerkitys Subversionille. Jälkimmäiset alkavat etuliitteellä svn:; esimerkiksi svn:externals on tällainen ominaisuus (katso lisää ulkoisten viitteiden käytöstä luvusta )." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgstr "Voit lisätä omia ominaisuuksiasi tai tiettyjä ominaisuuksia, joilla on erityismerkitys Gitille. Jälkimmäiset alkavat etuliitteellä svn:; esimerkiksi svn:externals on tällainen ominaisuus (katso lisää ulkoisten viitteiden käytöstä luvusta )." #. (title) #: ../source/TortoiseGit_en.xml:7609 @@ -6527,18 +6527,18 @@ msgstr "Tiivistetty yhdistelmä edellisestä neljästä avainsanasta." #. (para) #: ../source/TortoiseGit_en.xml:7616 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " -msgstr "Subversion tukee CVS-tyyppistä avainsanojen laajentamista, jota voi käyttää upottamaan tietoa tiedostosta ja sen versiosta itse tiedostoon. Nykyisin tuetut avainsanat ovat seuraavat: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgstr "Git tukee CVS-tyyppistä avainsanojen laajentamista, jota voi käyttää upottamaan tietoa tiedostosta ja sen versiosta itse tiedostoon. Nykyisin tuetut avainsanat ovat seuraavat: " #. (para) #: ../source/TortoiseGit_en.xml:7667 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." -msgstr "Oppiaksesi lisää avainsanojen käytöstä, lue Subversion-kirjan luku svn:keywords section." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." +msgstr "Oppiaksesi lisää avainsanojen käytöstä, lue Git-kirjan luku svn:keywords section." #. (para) #: ../source/TortoiseGit_en.xml:7677 -msgid "For more information about properties in Subversion see the Special Properties." -msgstr "Lisätietoa Subversion-ominaisuuksista löydät Subversion-kirjan luvusta Special Properties." +msgid "For more information about properties in Git see the Special Properties." +msgstr "Lisätietoa Git-ominaisuuksista löydät Git-kirjan luvusta Special Properties." #. (title) #: ../source/TortoiseGit_en.xml:7684 @@ -6642,13 +6642,13 @@ msgstr "Automaattiset ominaisuudet" #. (para) #: ../source/TortoiseGit_en.xml:7795 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." -msgstr "Voit komentaa Subversionin asettamaan tiedostoille ja kansioille ominaisuuksia automaattisesti kun ne lisätään arkistoon. Tähän on kaksi tapaa." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgstr "Voit komentaa Gitin asettamaan tiedostoille ja kansioille ominaisuuksia automaattisesti kun ne lisätään arkistoon. Tähän on kaksi tapaa." #. (para) #: ../source/TortoiseGit_en.xml:7800 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." -msgstr "Voit muokata Subversion-määrittelytiedostoa ottaaksesi tämän ominaisuuden käyttöön asiakaspäässä. SivuYleiset TortoiseGit-asetusikkunassa sisältää muokkauspainikkeen, joka tekee tämän suoraan. Määrittelytiedosto on yksinkertainen tekstitiedosto, joka ohjaa joitain Subversionin toimintoja. Sinun on muutettava kaksi asiaa: poista ensinnäkin miscellany-osiosta kommenttimerkit riviltä enable-auto-props = yes. Lisäksi sinun on määriteltävä seuraavaan osioon, mitkä ominaisuudet haluat lisätä ja mille tiedostotyypille. Tämä on Subversionin vakio-ominaisuus ja toimii kaikilla asiakasohjelmilla. Se on kuitenkin määritettävä jokaiseen työasemaan erikseen - asetusten noutaminen suoraan arkistosta ei ole tuettua." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgstr "Voit muokata Git-määrittelytiedostoa ottaaksesi tämän ominaisuuden käyttöön asiakaspäässä. SivuYleiset TortoiseGit-asetusikkunassa sisältää muokkauspainikkeen, joka tekee tämän suoraan. Määrittelytiedosto on yksinkertainen tekstitiedosto, joka ohjaa joitain Gitin toimintoja. Sinun on muutettava kaksi asiaa: poista ensinnäkin miscellany-osiosta kommenttimerkit riviltä enable-auto-props = yes. Lisäksi sinun on määriteltävä seuraavaan osioon, mitkä ominaisuudet haluat lisätä ja mille tiedostotyypille. Tämä on Gitin vakio-ominaisuus ja toimii kaikilla asiakasohjelmilla. Se on kuitenkin määritettävä jokaiseen työasemaan erikseen - asetusten noutaminen suoraan arkistosta ei ole tuettua." #. (para) #: ../source/TortoiseGit_en.xml:7817 @@ -6672,8 +6672,8 @@ msgstr "Ominaisuuksien toimittaminen arkistoon" #. (para) #: ../source/TortoiseGit_en.xml:7837 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." -msgstr "Subversion-ominaisuudet ovat versioituvia. Kun muutat tai lisäät ominaisuuden, sinun on toimitettava muutokset arkistoon." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." +msgstr "Git-ominaisuudet ovat versioituvia. Kun muutat tai lisäät ominaisuuden, sinun on toimitettava muutokset arkistoon." #. (title) #: ../source/TortoiseGit_en.xml:7843 @@ -6682,8 +6682,8 @@ msgstr "Ominaisuusristiriidat" #. (para) #: ../source/TortoiseGit_en.xml:7844 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." -msgstr "Jos muutoksia toimitettaessa syntyy ristiriita, koska toinen käyttäjä on muuttanut samaa ominaisuutta, Subversion luo .prej-tiedoston. Poista tämä tiedosto, kun olet ratkaissut ristiriidan." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." +msgstr "Jos muutoksia toimitettaessa syntyy ristiriita, koska toinen käyttäjä on muuttanut samaa ominaisuutta, Git luo .prej-tiedoston. Poista tämä tiedosto, kun olet ratkaissut ristiriidan." #. (title) #: ../source/TortoiseGit_en.xml:7853 @@ -6722,8 +6722,8 @@ msgstr "tsvn:logtemplate on hyödyllinen projekteissa, joissa #. (para) #: ../source/TortoiseGit_en.xml:7909 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." -msgstr "Subversion tukee automaattisia ominaisuuksia (autoprops), jotka lisätään uusille tai tuoduille tiedostoille niiden päätteen perusteella. Asetukset ovat työasemakohtaisia ja sijaitsevat Subversionin määrittelytiedostossa. Ominaisuus tsvn:autoprops voidaan asettaa kansioille; se yhdistetään käyttäjän paikallisiin automaattisiin ominaisuuksiin ja sitä käytetään lisättäessä tai tuotaessa tiedostoja. Esimerkiksi *.sh = svn:eol-style=native;svn:executable asettaa kaksi ominaisuutta tiedostoille, joilla on pääte .sh." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgstr "Git tukee automaattisia ominaisuuksia (autoprops), jotka lisätään uusille tai tuoduille tiedostoille niiden päätteen perusteella. Asetukset ovat työasemakohtaisia ja sijaitsevat Gitin määrittelytiedostossa. Ominaisuus tsvn:autoprops voidaan asettaa kansioille; se yhdistetään käyttäjän paikallisiin automaattisiin ominaisuuksiin ja sitä käytetään lisättäessä tai tuotaessa tiedostoja. Esimerkiksi *.sh = svn:eol-style=native;svn:executable asettaa kaksi ominaisuutta tiedostoille, joilla on pääte .sh." #. (para) #: ../source/TortoiseGit_en.xml:7922 @@ -6809,8 +6809,8 @@ msgstr "Kun lisäät uusia alikansioita TortoiseGit:n avulla, mahdolliset projek #. (para) #: ../source/TortoiseGit_en.xml:8042 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." -msgstr "Vaikka TortoiseGit:n projektiominaisuudet ovat varsin hyödyllisiä, ne toimivat vain TortoiseGit-ohjelmassa (ja jotkut eivät edes kaikissa versioissa). Jos projektissasi käytetään useita Subversion-asiakkaita (tai eri TortoiseGit-versioita), saatat haluta asentaa palvelimellle toimintokomentojonoja pakottamaan halutut projektikäytännöt. Projektiominaisuudet voivat vain auttaa käytännön toteuttamisessa, ei siihen pakottamisessa." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgstr "Vaikka TortoiseGit:n projektiominaisuudet ovat varsin hyödyllisiä, ne toimivat vain TortoiseGit-ohjelmassa (ja jotkut eivät edes kaikissa versioissa). Jos projektissasi käytetään useita Git-asiakkaita (tai eri TortoiseGit-versioita), saatat haluta asentaa palvelimellle toimintokomentojonoja pakottamaan halutut projektikäytännöt. Projektiominaisuudet voivat vain auttaa käytännön toteuttamisessa, ei siihen pakottamisessa." #. (title) #: ../source/TortoiseGit_en.xml:8055 @@ -6841,8 +6841,8 @@ msgstr "Toinen versionhallintajärjestelmien ominaisuus on kyky merkitä tiettyj #. (para) #: ../source/TortoiseGit_en.xml:8085 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." -msgstr "Subversion ei sisällä erityisiä komentoja haarautumiseen tai merkkien tekoon, vaan käyttää tarkoitukseen ns. halpoja kopioita. Halvat kopiot muistuttavat Unix-järjestelmien kovia linkkejä, mikä tarkoittaa, että täyden arkistokopion sijaan luodaan sisäinen linkki, joka osoittaa tiettyyn puuhun/versioon. Tästä syystä haarat ja merkkejä voidaan luodan hyvin nopeasti ja ne kuluttavat tuskin ollenkaan ylimääräistä tilaa arkistossa." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgstr "Git ei sisällä erityisiä komentoja haarautumiseen tai merkkien tekoon, vaan käyttää tarkoitukseen ns. halpoja kopioita. Halvat kopiot muistuttavat Unix-järjestelmien kovia linkkejä, mikä tarkoittaa, että täyden arkistokopion sijaan luodaan sisäinen linkki, joka osoittaa tiettyyn puuhun/versioon. Tästä syystä haarat ja merkkejä voidaan luodan hyvin nopeasti ja ne kuluttavat tuskin ollenkaan ylimääräistä tilaa arkistossa." #. (title) #: ../source/TortoiseGit_en.xml:8095 @@ -6904,7 +6904,7 @@ msgstr "Uusi haara on kaksoiskappale työkopiostasi. Jos olet päivittänyt työ #. (para) #: ../source/TortoiseGit_en.xml:8126 msgid "Now you have to select the source of the copy. Here you have three options: " -msgstr "Nyt on valittava, mistä kopio tehdään. Subversion tarjoaa kolme vaihtoehtoa: " +msgstr "Nyt on valittava, mistä kopio tehdään. Git tarjoaa kolme vaihtoehtoa: " #. (para) #: ../source/TortoiseGit_en.xml:8172 @@ -6988,8 +6988,8 @@ msgstr "Jos muutat haarasta tehtyä työkopiota ja toimitat muutoksesi arkistoon #. (para) #: ../source/TortoiseGit_en.xml:8272 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " -msgstr "Vaikka Subversion ei itse tee eroa merkkien ja haarojen välillä (ne ovat molemmat polkukopiota), niiden käyttötapa on tavallisesti erilainen. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgstr "Vaikka Git ei itse tee eroa merkkien ja haarojen välillä (ne ovat molemmat polkukopiota), niiden käyttötapa on tavallisesti erilainen. " #. (title) #: ../source/TortoiseGit_en.xml:8316 @@ -7014,8 +7014,8 @@ msgstr "Kun haaroja käytetään erillisten kehityspolkujen hallintaan, tulee en #. (para) #: ../source/TortoiseGit_en.xml:8326 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." -msgstr "On oleellista ymmärtää, miten haarautuminen ja yhdistäminen toimivat Subversionissa ennen kuin alat käyttää niitä - yhdistäminen voi joskus olla varsin monimutkaista. Kannattaa lukea Subversion-kirjan kappale Branching and Merging, jossa on hyvä kuvaus asiasta sekä lukuisia käyttöesimerkkejä." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." +msgstr "On oleellista ymmärtää, miten haarautuminen ja yhdistäminen toimivat Gitissa ennen kuin alat käyttää niitä - yhdistäminen voi joskus olla varsin monimutkaista. Kannattaa lukea Git-kirjan kappale Branching and Merging, jossa on hyvä kuvaus asiasta sekä lukuisia käyttöesimerkkejä." #. (para) #: ../source/TortoiseGit_en.xml:8336 @@ -7044,8 +7044,8 @@ msgstr "Tämä käyttötapaus sopii tilanteeseen, missä olet toimittanut yhden #. (para) #: ../source/TortoiseGit_en.xml:8369 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." -msgstr "Tässä tapauksessa pyydät Subversionia tekemään seuraavaa: Määritä tarvittavat muutokset, joilla päästään kehityshaaran A versiosta 1 (Mistä) kehityshaaran A versioon 7 (Mihin). Sovella sitten nämä muutokset työkopiooni (joka osoittaa päähaaraan tai haaraan B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgstr "Tässä tapauksessa pyydät Gitia tekemään seuraavaa: Määritä tarvittavat muutokset, joilla päästään kehityshaaran A versiosta 1 (Mistä) kehityshaaran A versioon 7 (Mihin). Sovella sitten nämä muutokset työkopiooni (joka osoittaa päähaaraan tai haaraan B)." #. (term) #. (title) @@ -7056,13 +7056,13 @@ msgstr "Yhdistä kehityshaara takaisin" #. (para) #: ../source/TortoiseGit_en.xml:8380 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." -msgstr "Tämä menetelmä sopii tilanteeseen, jossa olet luonut kehityshaaran Subversion-kirjan kuvaamalla tavalla. Kaikki päähaaran muutokset on viikko viikolta yhdistetty kehityshaaraan, ja nyt kun haara on saatu päätökseen, olet valmis yhdistämään sen takaisin päähaaraan. Koska olet pitänyt kehityshaaran ajan tasalla päähaaraan nähden, päähaaran ja kehityshaaran viimeisimmät versiot ovat identtiset lukuun ottamatta kehityshaaran muutoksia." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgstr "Tämä menetelmä sopii tilanteeseen, jossa olet luonut kehityshaaran Git-kirjan kuvaamalla tavalla. Kaikki päähaaran muutokset on viikko viikolta yhdistetty kehityshaaraan, ja nyt kun haara on saatu päätökseen, olet valmis yhdistämään sen takaisin päähaaraan. Koska olet pitänyt kehityshaaran ajan tasalla päähaaraan nähden, päähaaran ja kehityshaaran viimeisimmät versiot ovat identtiset lukuun ottamatta kehityshaaran muutoksia." #. (para) #: ../source/TortoiseGit_en.xml:8389 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." -msgstr "Tämä on erikoistapaus alla kuvatusta puitten yhdistämisestä, ja se tarvitsee vain yhdistettävän haaran paikantimen (joka siis normaalisti on kehityshaara). Menetelmä käyttää Subversionin yhdistämisjäljitystä laskeakseen tarvittavat versiovälit ja suorittaa muista tarkistuksia, jotka varmistavat, että kehityshaara sisältää kaikki päähaaran muutokset. Tämä varmistaa, että et vahingossa poista niitä muiden kehittäjien päähaaraan toimittamia muutoksia, jotka on tehty viimeisimmän synkronoinnin jälkeen." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgstr "Tämä on erikoistapaus alla kuvatusta puitten yhdistämisestä, ja se tarvitsee vain yhdistettävän haaran paikantimen (joka siis normaalisti on kehityshaara). Menetelmä käyttää Gitin yhdistämisjäljitystä laskeakseen tarvittavat versiovälit ja suorittaa muista tarkistuksia, jotka varmistavat, että kehityshaara sisältää kaikki päähaaran muutokset. Tämä varmistaa, että et vahingossa poista niitä muiden kehittäjien päähaaraan toimittamia muutoksia, jotka on tehty viimeisimmän synkronoinnin jälkeen." #. (para) #: ../source/TortoiseGit_en.xml:8399 @@ -7081,13 +7081,13 @@ msgstr "Kahden puun yhdistäminen" #. (para) #: ../source/TortoiseGit_en.xml:8419 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." -msgstr "Tämä on yleisempi versio takaisin yhdistämisestä, missä Subversion suorittaa seuraavat toimenpiteet: Määritä tarvittavat muutokset, jotta päästään päähaaran (Mistä) uusimmasta versiosta kehityshaaran (Mihin) uusimpaan versioon. Sovella sitten nämä muutokset työkopioon (joka osoittaa päähaaraan). Lopputuloksena päähaara on identtinen kehityshaaran kanssa." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgstr "Tämä on yleisempi versio takaisin yhdistämisestä, missä Git suorittaa seuraavat toimenpiteet: Määritä tarvittavat muutokset, jotta päästään päähaaran (Mistä) uusimmasta versiosta kehityshaaran (Mihin) uusimpaan versioon. Sovella sitten nämä muutokset työkopioon (joka osoittaa päähaaraan). Lopputuloksena päähaara on identtinen kehityshaaran kanssa." #. (para) #: ../source/TortoiseGit_en.xml:8427 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." -msgstr "Jos palvelimesi/arkistosi ei tue tehtyjen yhdistämisten jäljitystä, tämä on ainoa tapa yhdistää kehityshaara takaisin päähaaraan. Toinen käyttötapaus on se, että käytät ulkoisia komponentteja (engl. vendor branches) ja joudut yhdistämään ulkoisen komponentin uuden version muutokset päähaaraasi. Lue lisää tästä Subversion-kirjan luvusta vendor branches." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." +msgstr "Jos palvelimesi/arkistosi ei tue tehtyjen yhdistämisten jäljitystä, tämä on ainoa tapa yhdistää kehityshaara takaisin päähaaraan. Toinen käyttötapaus on se, että käytät ulkoisia komponentteja (engl. vendor branches) ja joudut yhdistämään ulkoisen komponentin uuden version muutokset päähaaraasi. Lue lisää tästä Git-kirjan luvusta vendor branches." #. (title) #: ../source/TortoiseGit_en.xml:8442 @@ -7131,8 +7131,8 @@ msgstr "TortoiseGit määrittää yhdistettävät muutokset pylväsvälie #. (para) #: ../source/TortoiseGit_en.xml:8490 -msgid "If you are merging revisions in chunks, the method shown in the subversion book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." -msgstr "Jos yhdistät versioita paloittain, Subversion-kirjan kuvaamalla menetelmällä yhdistäisit ensin versiot 100-200 ja seuraavalla kerralla versiot 200-300. TortoiseGit-yhdistäminen sen sijaan tapahtuu yhdistämällä ensin muutosjoukot 100-200 ja seuraavalla kerralla muutosjoukot 201-300." +msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." +msgstr "Jos yhdistät versioita paloittain, Git-kirjan kuvaamalla menetelmällä yhdistäisit ensin versiot 100-200 ja seuraavalla kerralla versiot 200-300. TortoiseGit-yhdistäminen sen sijaan tapahtuu yhdistämällä ensin muutosjoukot 100-200 ja seuraavalla kerralla muutosjoukot 201-300." #. (para) #: ../source/TortoiseGit_en.xml:8497 @@ -7156,8 +7156,8 @@ msgstr "Jos olet jo aiemmin yhdistänyt muita muutoksia tästä haarasta, olet #. (para) #: ../source/TortoiseGit_en.xml:8535 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." -msgstr "Jos hyödynnät Subversionin yhdistämisjäljitysominaisuuksia, sinun ei tarvitse muistaa, mitä versioita on aiemmin yhdistetty - Subversion pitää niistä kirjaa puolestasi. Jos jätät versiovälin tyhjäksi, mukaan sisällytetään kaikki aiemmin yhdistämättömät versiot. Lue luvusta lisää asiasta." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgstr "Jos hyödynnät Gitin yhdistämisjäljitysominaisuuksia, sinun ei tarvitse muistaa, mitä versioita on aiemmin yhdistetty - Git pitää niistä kirjaa puolestasi. Jos jätät versiovälin tyhjäksi, mukaan sisällytetään kaikki aiemmin yhdistämättömät versiot. Lue luvusta lisää asiasta." #. (para) #: ../source/TortoiseGit_en.xml:8543 @@ -7251,8 +7251,8 @@ msgstr "Voit myös määrittää yhdistämissyvyyden, ts. kuinka syvälle työko #. (para) #: ../source/TortoiseGit_en.xml:8645 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" -msgstr "Useimmiten yhdistäminen kannattaa suorittaa ottamalla tiedoston historia huomioon siten, että yhdistettävuksi valitaan muutokset suhteessa yhteiseen edeltäjään. Joskus kuitenkin voi olla tarpeen yhdistää tiedostoja, jotka ovat suhteessa toisiinsa, mutta joilla ei ole yhteistä versiohistoriaa arkistossa. Olet esimerkiksi saattanut tuoda jonkun kirjaston versiot 1 ja 2 kahteen eri hakemistoon. Vaikka ne ovat loogisesti suhteessa keskenään, Subversion ei tiedä sitä, koska se näkee vain tuomasi tiedostot. Jos yrität yhdistää nämä puut, havaitset, että ensin kaikki tiedostot poistetaan ja sitten lisätään uudestaan. Ohjataksesi Subversionin käyttämään polkuihin perustuvia eroja historiaan pohjautuvien erojen sijaan, ruksaa valinta Ohita edeltäjät. Tästä aiheesta löydät lisätietoa Subversion-kirjan luvusta Noticing or Ignoring Ancestry." +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" +msgstr "Useimmiten yhdistäminen kannattaa suorittaa ottamalla tiedoston historia huomioon siten, että yhdistettävuksi valitaan muutokset suhteessa yhteiseen edeltäjään. Joskus kuitenkin voi olla tarpeen yhdistää tiedostoja, jotka ovat suhteessa toisiinsa, mutta joilla ei ole yhteistä versiohistoriaa arkistossa. Olet esimerkiksi saattanut tuoda jonkun kirjaston versiot 1 ja 2 kahteen eri hakemistoon. Vaikka ne ovat loogisesti suhteessa keskenään, Git ei tiedä sitä, koska se näkee vain tuomasi tiedostot. Jos yrität yhdistää nämä puut, havaitset, että ensin kaikki tiedostot poistetaan ja sitten lisätään uudestaan. Ohjataksesi Gitin käyttämään polkuihin perustuvia eroja historiaan pohjautuvien erojen sijaan, ruksaa valinta Ohita edeltäjät. Tästä aiheesta löydät lisätietoa Git-kirjan luvusta Noticing or Ignoring Ancestry." #. (para) #: ../source/TortoiseGit_en.xml:8662 @@ -7286,13 +7286,13 @@ msgstr "Yhdistäminen on nyt valmis. Kannattaa tutkia tuloksia ja varmistua, ett #. (para) #: ../source/TortoiseGit_en.xml:8706 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." -msgstr "Versiota 1.5 aiemmat Subversion-asiakkaat ja palvelimet eivät talleta tietoa tehdyistä yhdistämisistä, vaan niistä on pidettävä kirjaa käsin. Kun olet testannut muutokset ja toimitat ne arkistoon, lokiviestisi tulisi aina sisältää ne versionumerot, jotka yhdistettiin. Jos haluat myöhemmin suorittaa toisen yhdistämisen, sinun on tiedettävä mitä olet jo yhdistänyt, koska samaa versiota ei voi ilman ristiriitoja yhdistää kahdesti. Lisää yksityiskohtia yhdistämisestä löydät Subversion-kirjan luvusta Best Practices for Merging." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." +msgstr "Versiota 1.5 aiemmat Git-asiakkaat ja palvelimet eivät talleta tietoa tehdyistä yhdistämisistä, vaan niistä on pidettävä kirjaa käsin. Kun olet testannut muutokset ja toimitat ne arkistoon, lokiviestisi tulisi aina sisältää ne versionumerot, jotka yhdistettiin. Jos haluat myöhemmin suorittaa toisen yhdistämisen, sinun on tiedettävä mitä olet jo yhdistänyt, koska samaa versiota ei voi ilman ristiriitoja yhdistää kahdesti. Lisää yksityiskohtia yhdistämisestä löydät Git-kirjan luvusta Best Practices for Merging." #. (para) #: ../source/TortoiseGit_en.xml:8723 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." -msgstr "Jos palvelimesi ja kaikki asiakasohjelmat käyttävät vähintään Subversion-versiota 1.5, tehdyt yhdistämiset muistetaan automaattisesti eikä niitä tehdä useammin kuin kerran. Tämä helpottaa yhdistämistä huomattavasti, koska voit joka kerta yksinkertaisesti valita kaikki versiot yhdistettäväksi ja antaa järjestelmän huolehtia lopusta." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgstr "Jos palvelimesi ja kaikki asiakasohjelmat käyttävät vähintään Git-versiota 1.5, tehdyt yhdistämiset muistetaan automaattisesti eikä niitä tehdä useammin kuin kerran. Tämä helpottaa yhdistämistä huomattavasti, koska voit joka kerta yksinkertaisesti valita kaikki versiot yhdistettäväksi ja antaa järjestelmän huolehtia lopusta." #. (para) #: ../source/TortoiseGit_en.xml:8730 @@ -7306,8 +7306,8 @@ msgstr "Jos olet juuri yhdistänyt kehityshaaran päähaaraan, se sisältää ka #. (para) #: ../source/TortoiseGit_en.xml:8745 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." -msgstr "Subversion ei tue tiedoston yhdistämistä kansion kanssa tai päinvastoin - vain kansioista kansioihin tai tiedostoista tiedostoihin. Jos avaat yhdistämiskkunan tiedoston kontekstivalikosta, sinun on annettava yhdistämispaikantimeksi tiedostopolku. Jos taas avaat yhdistämisikkunan kansion kontekstivalikosta, yhdistämispaikantimeksi on annettava kansiopolku." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgstr "Git ei tue tiedoston yhdistämistä kansion kanssa tai päinvastoin - vain kansioista kansioihin tai tiedostoista tiedostoihin. Jos avaat yhdistämiskkunan tiedoston kontekstivalikosta, sinun on annettava yhdistämispaikantimeksi tiedostopolku. Jos taas avaat yhdistämisikkunan kansion kontekstivalikosta, yhdistämispaikantimeksi on annettava kansiopolku." #. (title) #: ../source/TortoiseGit_en.xml:8755 @@ -7346,18 +7346,18 @@ msgstr "Voit merkitä versioita älä yhdistä-leimalla sis #. (para) #: ../source/TortoiseGit_en.xml:8759 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " -msgstr "Subversion 1.5 lisäsi tuen ja työkaluja tehtyjen yhdistämisten jäljittämiselle. Kun yhdistät muutoksia hakemistopuusta toiseen, yhdistetyt versionumero talletetaan, ja tät tietoa voidaan käyttää useisiin eri tarkoituksiin. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgstr "Git 1.5 lisäsi tuen ja työkaluja tehtyjen yhdistämisten jäljittämiselle. Kun yhdistät muutoksia hakemistopuusta toiseen, yhdistetyt versionumero talletetaan, ja tät tietoa voidaan käyttää useisiin eri tarkoituksiin. " #. (para) #: ../source/TortoiseGit_en.xml:8801 msgid "Merge tracking information is stored in the svn:mergeinfo property by the client when it performs a merge. When the merge is committed the server stores that information in a database, and when you request merge, log or blame information, the server can respond appropriately. For the system to work properly you must ensure that the server, the repository and all clients are upgraded. Earlier clients will not store the svn:mergeinfo property and earlier servers will not provide the information requested by new clients." -msgstr "Tieto tehdyistä yhdistämisistä talletetaan svn:mergeinfo-ominaisuuteen Subversion-asiakkaan toimesta yhdistämisen aikana. Kun yhdistämisen tulos toimitetaan arkistoon, palvelin tallettaa tiedot tietokantaan, ja kykenee myöhemmin antamaan yhdistämiseen liittyviä tietoja loki-, tekijän selvitys tai yhdistämispyyntöjen yhteydessä. Jotta järjestelmä toimisi kunnolla, on sekä palvelin että kaikki asiakasohjelmat päivitettävä. Vanhemmat asiakasohjelmat eivät talleta svn:mergeinfo-ominaisuutta, ja vanhemmat palvelimet eivät kykene vastaamaan uudempien asiakasohjelmien kyselyihin." +msgstr "Tieto tehdyistä yhdistämisistä talletetaan svn:mergeinfo-ominaisuuteen Git-asiakkaan toimesta yhdistämisen aikana. Kun yhdistämisen tulos toimitetaan arkistoon, palvelin tallettaa tiedot tietokantaan, ja kykenee myöhemmin antamaan yhdistämiseen liittyviä tietoja loki-, tekijän selvitys tai yhdistämispyyntöjen yhteydessä. Jotta järjestelmä toimisi kunnolla, on sekä palvelin että kaikki asiakasohjelmat päivitettävä. Vanhemmat asiakasohjelmat eivät talleta svn:mergeinfo-ominaisuutta, ja vanhemmat palvelimet eivät kykene vastaamaan uudempien asiakasohjelmien kyselyihin." #. (para) #: ../source/TortoiseGit_en.xml:8811 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." -msgstr "Lisätietoa tehtyjen yhdistämisten jäljittämisestä löydät dokumentista Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." +msgstr "Lisätietoa tehtyjen yhdistämisten jäljittämisestä löydät dokumentista Merge tracking documentation." #. (title) #: ../source/TortoiseGit_en.xml:8819 @@ -7471,18 +7471,18 @@ msgstr "Yrityksesi on aina ennen käyttänyt lukituksiin perustuvaa versionhalli #. (para) #: ../source/TortoiseGit_en.xml:8945 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " -msgstr "Subversion toimii yleisesti ottaen parhaiten ilman lukitusta, käyttäen luvussa kuvattua menetelmää. On kuitenkin muutamia tilanteita, jolloin saattaa olla tarpeen ottaa lukitus käyttöön. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgstr "Git toimii yleisesti ottaen parhaiten ilman lukitusta, käyttäen luvussa kuvattua menetelmää. On kuitenkin muutamia tilanteita, jolloin saattaa olla tarpeen ottaa lukitus käyttöön. " #. (para) #: ../source/TortoiseGit_en.xml:8969 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." -msgstr "Ensin on syytä varmistaa, että Subversion-palvelimesi on päivitetty vähintään versioon 1.2. Aiemmat versiot eivät tukeneet lukitusta. Jos käytät file:// -yhteyskäytäntöä, riittää tietenkin, että Subversion-asiakasohjelma päivitetään." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgstr "Ensin on syytä varmistaa, että Git-palvelimesi on päivitetty vähintään versioon 1.2. Aiemmat versiot eivät tukeneet lukitusta. Jos käytät file:// -yhteyskäytäntöä, riittää tietenkin, että Git-asiakasohjelma päivitetään." #. (title) #: ../source/TortoiseGit_en.xml:8976 -msgid "How Locking Works in Subversion" -msgstr "Kuinka lukitus toimii Subversionissa" +msgid "How Locking Works in Git" +msgstr "Kuinka lukitus toimii Gitissa" #. (para) #: ../source/TortoiseGit_en.xml:8977 @@ -7496,8 +7496,8 @@ msgstr "Kun lukitset tiedoston, vain sinä voit toimittaa #. (para) #: ../source/TortoiseGit_en.xml:8990 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." -msgstr "Muut kehittäjät eivät kuitenkaan välttämättä tiedä, että olet lukinnut tiedoston. Jolleivät he tarkista lukitustilannetta säännöllisesti, tilanne valkenee heille ensimmäisen kerran, kun toimitus arkistoon epäonnistuu. Tämä ei ole useimmiten kovin hyödyllistä. Jotta lukkojen hallinta olisi helpompaa, Subversion tukee erityistä svn:needs-lock -ominaisuutta. Kun tämä ominaisuus on asetettu jollekin tiedostolle (mihin tahansa arvoon), paikallinen työkopio kirjoitussuojataan aina työkopion haun tai päivityksen yhteydessä ellei tiedosto ole jo lukittu ko. työkopiossa. Tämä toimii varoituksena, että tiedostoa ei tulisi muokata, ellei sitä ole ensin lukittu. Kirjoitussuojatuilla, versioiduilla tiedostoilla on TortoiseGit:ssä erityinen kuvakepäällys, joka myös viestittää, että tiedosto on lukittava ennen muokkaamista." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgstr "Muut kehittäjät eivät kuitenkaan välttämättä tiedä, että olet lukinnut tiedoston. Jolleivät he tarkista lukitustilannetta säännöllisesti, tilanne valkenee heille ensimmäisen kerran, kun toimitus arkistoon epäonnistuu. Tämä ei ole useimmiten kovin hyödyllistä. Jotta lukkojen hallinta olisi helpompaa, Git tukee erityistä svn:needs-lock -ominaisuutta. Kun tämä ominaisuus on asetettu jollekin tiedostolle (mihin tahansa arvoon), paikallinen työkopio kirjoitussuojataan aina työkopion haun tai päivityksen yhteydessä ellei tiedosto ole jo lukittu ko. työkopiossa. Tämä toimii varoituksena, että tiedostoa ei tulisi muokata, ellei sitä ole ensin lukittu. Kirjoitussuojatuilla, versioiduilla tiedostoilla on TortoiseGit:ssä erityinen kuvakepäällys, joka myös viestittää, että tiedosto on lukittava ennen muokkaamista." #. (para) #: ../source/TortoiseGit_en.xml:9006 @@ -7506,8 +7506,8 @@ msgstr "Lukot ovat kehittäjä- ja työkopiokohtaisia. Jos sinulla on useita ty #. (para) #: ../source/TortoiseGit_en.xml:9012 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." -msgstr "Mikä neuvoksi, jos työtoverisi lukitsee tiedoston ja lähtee sitten esim. lomalle vapauttamatta sitä? Subversionissa on työkalut lukon pakotettuun vapauttamiseen. Jonkun toisen lukitseman tiedoston lukituksen purkua kutsutaan lukon rikkomiseksi. Jonkun toisen lukitseman tiedoston lukitusta itselle kutsutaan lukon varastamiseksi. Näitä toimenpiteitä ei tietenkään pidä tehdä kevyin perustein, mikäli haluat pysyä väleissä työtoveriesi kanssa." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgstr "Mikä neuvoksi, jos työtoverisi lukitsee tiedoston ja lähtee sitten esim. lomalle vapauttamatta sitä? Gitissa on työkalut lukon pakotettuun vapauttamiseen. Jonkun toisen lukitseman tiedoston lukituksen purkua kutsutaan lukon rikkomiseksi. Jonkun toisen lukitseman tiedoston lukitusta itselle kutsutaan lukon varastamiseksi. Näitä toimenpiteitä ei tietenkään pidä tehdä kevyin perustein, mikäli haluat pysyä väleissä työtoveriesi kanssa." #. (para) #: ../source/TortoiseGit_en.xml:9022 @@ -7576,8 +7576,8 @@ msgstr "Vältä lukkojen rikkomista ja varastamista" #. (para) #: ../source/TortoiseGit_en.xml:9113 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." -msgstr "Jos rikot tai varastat jonkun muun lukon kertomatta heille, saatat aiheuttaa turhaa työtä. Jos muutettavat tiedostot eivät ole yhdistettävissä ja varastat jonkun toisen lukon, niin lukon vapauttamisen jälkeen he ovat vapaita toimittamaan omat muutoksensa ja samalla ylikirjoittamaan sinun muutoksesi. Subversion ei hukkaa tietoa, mutta olet lukon varastamalla menettänyt sen antaman ryhmätyötuen." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." +msgstr "Jos rikot tai varastat jonkun muun lukon kertomatta heille, saatat aiheuttaa turhaa työtä. Jos muutettavat tiedostot eivät ole yhdistettävissä ja varastat jonkun toisen lukon, niin lukon vapauttamisen jälkeen he ovat vapaita toimittamaan omat muutoksensa ja samalla ylikirjoittamaan sinun muutoksesi. Git ei hukkaa tietoa, mutta olet lukon varastamalla menettänyt sen antaman ryhmätyötuen." #. (title) #: ../source/TortoiseGit_en.xml:9125 @@ -7591,8 +7591,8 @@ msgstr "Kuten edellä on kuvattu, tehokkain tapa käyttää lukitusta on asettaa #. (para) #: ../source/TortoiseGit_en.xml:9136 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." -msgstr "Jos projektissasi on voimassa käytäntö, jonka mukaan tiedostot on lukittava ennen niiden muuttamista, saattaa olla näppärää käyttää Subversionin automaattisia ominaisuuksia asettamaan ominaisuus aina, kun lisäät uusia tiedostoja. Katso lisää aiheesta luvusta ." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgstr "Jos projektissasi on voimassa käytäntö, jonka mukaan tiedostot on lukittava ennen niiden muuttamista, saattaa olla näppärää käyttää Gitin automaattisia ominaisuuksia asettamaan ominaisuus aina, kun lisäät uusia tiedostoja. Katso lisää aiheesta luvusta ." #. (title) #: ../source/TortoiseGit_en.xml:9145 @@ -7601,8 +7601,8 @@ msgstr "Lukituskomentojonot" #. (para) #: ../source/TortoiseGit_en.xml:9146 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." -msgstr "Kun luot uuden arkiston, niin Subversion-versiosta 1.2 alkaen arkiston hooks-hakemistoon luodaan neljä komentojonopohjaa. Näitä kutsutaan ennen lukitusta ja lukon vapautusta sekä lukituksen ja lukon vapautuksen jälkeen." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgstr "Kun luot uuden arkiston, niin Git-versiosta 1.2 alkaen arkiston hooks-hakemistoon luodaan neljä komentojonopohjaa. Näitä kutsutaan ennen lukitusta ja lukon vapautusta sekä lukituksen ja lukon vapautuksen jälkeen." #. (para) #: ../source/TortoiseGit_en.xml:9152 @@ -8378,8 +8378,8 @@ msgstr "Voit myös yhdistää muutokset valituista versioista toiseen työkopioo #. (para) #: ../source/TortoiseGit_en.xml:10131 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." -msgstr "Koska Subversion ei kykene antamaan kaikkea tarvittavaa tietoa, tarvitaan jonkun verran tulkintaa, ja tämä voi joskus tuottaa outoja tuloksia. Yhtä kaikki, päähaaran tulokset ovat yleensä hyödyllisiä." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgstr "Koska Git ei kykene antamaan kaikkea tarvittavaa tietoa, tarvitaan jonkun verran tulkintaa, ja tämä voi joskus tuottaa outoja tuloksia. Yhtä kaikki, päähaaran tulokset ovat yleensä hyödyllisiä." #. (para) #: ../source/TortoiseGit_en.xml:10141 @@ -8423,8 +8423,8 @@ msgstr " Napsauta ympyränäpp #. (title) #: ../source/TortoiseGit_en.xml:10191 -msgid "Exporting a Subversion Working Copy" -msgstr "Subversion-työkopion vienti" +msgid "Exporting a Git Working Copy" +msgstr "Git-työkopion vienti" #. (primary) #: ../source/TortoiseGit_en.xml:10193 @@ -8478,8 +8478,8 @@ msgstr "Yksittäisten tiedostojen vienti" #. (para) #: ../source/TortoiseGit_en.xml:10266 -msgid "The export dialog does not allow exporting single files, even though Subversion can." -msgstr "Vienti-ikkuna ei salli yksittäisen tiedostojen viemistä, vaikka Subversion tukee sitä." +msgid "The export dialog does not allow exporting single files, even though Git can." +msgstr "Vienti-ikkuna ei salli yksittäisen tiedostojen viemistä, vaikka Git tukee sitä." #. (para) #: ../source/TortoiseGit_en.xml:10270 @@ -8585,8 +8585,8 @@ msgstr "Tämä on hyvin harvoin käytetty komento. Uudellee #. (para) #: ../source/TortoiseGit_en.xml:10375 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." -msgstr "Haluat siirtyä eri Subversion-arkistoon. Tässä tapauksessa on syytä hakea tuore työkopio uudesta arkistosta." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." +msgstr "Haluat siirtyä eri Git-arkistoon. Tässä tapauksessa on syytä hakea tuore työkopio uudesta arkistosta." #. (para) #: ../source/TortoiseGit_en.xml:10381 @@ -8630,8 +8630,8 @@ msgstr "vikaseurantaohjelma" #. (para) #: ../source/TortoiseGit_en.xml:10415 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." -msgstr "Ohjelmistokehityksessä on tavallista, että muutokset liittyvät johonkin vikaan tai parannushedotukseen. Vikaseurantaohjelmien käyttäjät haluavat usein kytkeä Subversioniin tehdyt muutokset tiettyyn tunnukseen vikaseurantaohjelmassa. Useimpien tällaisten ohjelmien mukana tuleekin ennen toimitusta suoritettava komentojono, joka jäsentää lokiviestin ja etsii vikatunnuksen, johon toimitus liittyy. Tämä on hieman virhealtista, koska se luottaa käyttäjän kykyyn kirjoittaa lokiviesti virheittä, jotta komentojono osaa jäsentää sen oikein." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgstr "Ohjelmistokehityksessä on tavallista, että muutokset liittyvät johonkin vikaan tai parannushedotukseen. Vikaseurantaohjelmien käyttäjät haluavat usein kytkeä Gitiin tehdyt muutokset tiettyyn tunnukseen vikaseurantaohjelmassa. Useimpien tällaisten ohjelmien mukana tuleekin ennen toimitusta suoritettava komentojono, joka jäsentää lokiviestin ja etsii vikatunnuksen, johon toimitus liittyy. Tämä on hieman virhealtista, koska se luottaa käyttäjän kykyyn kirjoittaa lokiviesti virheittä, jotta komentojono osaa jäsentää sen oikein." #. (para) #: ../source/TortoiseGit_en.xml:10428 @@ -8811,13 +8811,13 @@ msgstr "Vikaseurantatiedot eivät ole käytettävissä arkistoselaimessa" #. (para) #: ../source/TortoiseGit_en.xml:10722 -msgid "Because the issue tracker integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." -msgstr "Koska kytkentä vikaseurantaohjelmiin vaatii Subversion-ominaisuuksien käyttöä, näet tulokset vain työkopion kautta. Ominaisuuksien haku palvelimelta on hidasta, joten tämä toiminto ei ole käytettävissä arkistoselaimessa." +msgid "Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgstr "Koska kytkentä vikaseurantaohjelmiin vaatii Git-ominaisuuksien käyttöä, näet tulokset vain työkopion kautta. Ominaisuuksien haku palvelimelta on hidasta, joten tämä toiminto ei ole käytettävissä arkistoselaimessa." #. (para) #: ../source/TortoiseGit_en.xml:10729 -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." -msgstr "Virheenjäljitysintegraatio ei ole TortoiseGit-riippuvaista; sitä voi käyttää minkä tahansa Subversion-asiakkaan kanssa. Katso kaikki yksityiskohdat dokumentista Issue Tracker Integration Specification. (Kappale kertoo, miten TortoiseGit-arkistoon kytkeydytään)." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgstr "Virheenjäljitysintegraatio ei ole TortoiseGit-riippuvaista; sitä voi käyttää minkä tahansa Git-asiakkaan kanssa. Katso kaikki yksityiskohdat dokumentista Issue Tracker Integration Specification. (Kappale kertoo, miten TortoiseGit-arkistoon kytkeydytään)." #. (title) #: ../source/TortoiseGit_en.xml:10740 @@ -8876,8 +8876,8 @@ msgstr "WebSVN" #. (para) #: ../source/TortoiseGit_en.xml:10799 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." -msgstr "Subversionin yhteyteen on saatavilla useita web-pohjaisia arkistoselaimia, esim. ViewVC ja WebSVN. TortoiseGit tukee kytkeytymistä näihin selaimiin." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgstr "Gitin yhteyteen on saatavilla useita web-pohjaisia arkistoselaimia, esim. ViewVC ja WebSVN. TortoiseGit tukee kytkeytymistä näihin selaimiin." #. (para) #: ../source/TortoiseGit_en.xml:10811 @@ -8906,8 +8906,8 @@ msgstr "Linkit web-selaimiin eivät ole käytettävissä arkistoselaimessa" #. (para) #: ../source/TortoiseGit_en.xml:10895 -msgid "Because the repo viewer integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." -msgstr "Koska kytkentä web-selaimiin vaatii Subversion-ominaisuuksien käyttöä, näet tulokset vain työkopion kautta. Ominaisuuksien haku palvelimelta on hidasta, joten tämä toiminto ei ole käytettävissä arkistoselaimessa." +msgid "Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgstr "Koska kytkentä web-selaimiin vaatii Git-ominaisuuksien käyttöä, näet tulokset vain työkopion kautta. Ominaisuuksien haku palvelimelta on hidasta, joten tämä toiminto ei ole käytettävissä arkistoselaimessa." #. (title) #: ../source/TortoiseGit_en.xml:10904 @@ -8941,8 +8941,8 @@ msgstr "Asetusikkuna, yleiset asetukset -sivu" #. (para) #: ../source/TortoiseGit_en.xml:10921 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." -msgstr " Tässä ikkunassa voit määrittää käyttöliittymän kielen sekä Subversion-kohtaiset asetukset." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." +msgstr " Tässä ikkunassa voit määrittää käyttöliittymän kielen sekä Git-kohtaiset asetukset." #. (term) #: ../source/TortoiseGit_en.xml:10931 @@ -9011,13 +9011,13 @@ msgstr "Yleisiä ohituslausekkeita käytetään estämään versioimattomien tie #. (para) #: ../source/TortoiseGit_en.xml:11001 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." -msgstr "Huomaa, että täällä määrittämäsi ohituslausekkeet koskevat myös muita Subversion-asiakkaita työasemassasi, mukaan lukien komentoriviasiakas." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." +msgstr "Huomaa, että täällä määrittämäsi ohituslausekkeet koskevat myös muita Git-asiakkaita työasemassasi, mukaan lukien komentoriviasiakas." #. (para) #: ../source/TortoiseGit_en.xml:11007 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." -msgstr "Jos käytät Subversionin määrittelytiedostoa asettaaksesi global-ignores -lausekkeen, se voittaa täällä tekemäsi määritykset. Voit muokata Subversionin määrittelytiedostoa painikkeen Muokkaa avulla, kuten alla on kuvattu." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." +msgstr "Jos käytät Gitin määrittelytiedostoa asettaaksesi global-ignores -lausekkeen, se voittaa täällä tekemäsi määritykset. Voit muokata Gitin määrittelytiedostoa painikkeen Muokkaa avulla, kuten alla on kuvattu." #. (para) #: ../source/TortoiseGit_en.xml:11015 @@ -9036,13 +9036,13 @@ msgstr "Tämä valinta ohjaa TortoiseGit:n asettamaan tiedostojen päiväykset v #. (term) #: ../source/TortoiseGit_en.xml:11043 -msgid "Subversion configuration file" -msgstr "Subversionin määrittelytiedosto" +msgid "Git configuration file" +msgstr "Gitin määrittelytiedosto" #. (para) #: ../source/TortoiseGit_en.xml:11045 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." -msgstr "Käytä painiketta Muokkaa muokataksesi Subversionin määrittelytiedostoa suoraan. Joitain asetuksia ei voi muuttaa suoraan TortoiseGit:n avulla, vaan ne on asetettava tällä tavalla. Katso lisätietoa config-tiedoston rakenteesta Subversion-kirjan luvusta Runtime Configuration Area. Kappale Automatic Property Setting on erityisen kiinnostava, ja sen tiedot määritellään tässä. Huomaa, että Subversion voi lukea asetuksia useasta paikasta, ja sinun on tiedettävä, mikä asetus voittaa. Kannattaa lukaista myös Configuration and the Windows Registry." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgstr "Käytä painiketta Muokkaa muokataksesi Gitin määrittelytiedostoa suoraan. Joitain asetuksia ei voi muuttaa suoraan TortoiseGit:n avulla, vaan ne on asetettava tällä tavalla. Katso lisätietoa config-tiedoston rakenteesta Git-kirjan luvusta Runtime Configuration Area. Kappale Automatic Property Setting on erityisen kiinnostava, ja sen tiedot määritellään tässä. Huomaa, että Git voi lukea asetuksia useasta paikasta, ja sinun on tiedettävä, mikä asetus voittaa. Kannattaa lukaista myös Configuration and the Windows Registry." #. (term) #: ../source/TortoiseGit_en.xml:11070 @@ -9051,13 +9051,13 @@ msgstr "Käytä _svn-kansioita .svn-ka #. (para) #: ../source/TortoiseGit_en.xml:11072 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." -msgstr "VS.NET ei web-projektien yhteydessä osaa käsitellä .svn-kansioita, joita Subversion käyttää tilatietojen tallettamiseen. Tämä ei ole Subversion-ongelma, vaan virhe VS.NET-ohjelmassa ja sen käyttämissä Frontpage-laajennuksissa. Lue kappaleesta lisää asiasta." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgstr "VS.NET ei web-projektien yhteydessä osaa käsitellä .svn-kansioita, joita Git käyttää tilatietojen tallettamiseen. Tämä ei ole Git-ongelma, vaan virhe VS.NET-ohjelmassa ja sen käyttämissä Frontpage-laajennuksissa. Lue kappaleesta lisää asiasta." #. (para) #: ../source/TortoiseGit_en.xml:11079 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." -msgstr "Jos haluat muuttaa Subversionin ja TortoiseGit:n toimintaa, voit käyttää tätä valintaa asettamaan tarvittavan ympäristömuuttujan." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgstr "Jos haluat muuttaa Gitin ja TortoiseGit:n toimintaa, voit käyttää tätä valintaa asettamaan tarvittavan ympäristömuuttujan." #. (para) #: ../source/TortoiseGit_en.xml:11084 @@ -9171,8 +9171,8 @@ msgstr "Valinta Sulje automaattisesti jos ei ristiriitoja h #. (para) #: ../source/TortoiseGit_en.xml:11220 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." -msgstr "Valinta Sulje automaattisesti, jos ei virheitä sulkee aina ikkunan, vaikka toiminto synnyttäisi ristiriitoja. Ikkuna säilyy avoinna vain virhetilanteessa, eli kun Subversion ei kykene viemään toimintoa loppuun. Näin käy esimerkiksi silloin, kun päivitys epäonnistuu (koska palvelimeen ei saada yhteyttä) tai arkistotoimitus epäonnistuu (koska työkopio ei ole ajan tasalla)." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgstr "Valinta Sulje automaattisesti, jos ei virheitä sulkee aina ikkunan, vaikka toiminto synnyttäisi ristiriitoja. Ikkuna säilyy avoinna vain virhetilanteessa, eli kun Git ei kykene viemään toimintoa loppuun. Näin käy esimerkiksi silloin, kun päivitys epäonnistuu (koska palvelimeen ei saada yhteyttä) tai arkistotoimitus epäonnistuu (koska työkopio ei ole ajan tasalla)." #. (term) #: ../source/TortoiseGit_en.xml:11232 @@ -9556,13 +9556,13 @@ msgstr "Asetusta Pois jätettävät polut käytetään kert #. (para) #: ../source/TortoiseGit_en.xml:11652 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "f:\\development\\SVN\\Subversion estää kuvakepäällykset vain määritellystä kansiosta. Kuvakepäällykset näkyvät yhä kaikille tiedostoille ja kansioille määritellyn kansion sisällä." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "f:\\development\\SVN\\Git estää kuvakepäällykset vain määritellystä kansiosta. Kuvakepäällykset näkyvät yhä kaikille tiedostoille ja kansioille määritellyn kansion sisällä." #. (para) #: ../source/TortoiseGit_en.xml:11657 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "f:\\development\\SVN\\Subversion* poistaa kuvakepäällykset kaikista tiedostoista ja kansioista, joiden polku alkaa merkkijonolla f:\\development\\SVN\\Subversion. Siten et näe kuvakepäällyksiä millekään tiedostolle tai kansiolle määritellyn polun alapuolella." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "f:\\development\\SVN\\Git* poistaa kuvakepäällykset kaikista tiedostoista ja kansioista, joiden polku alkaa merkkijonolla f:\\development\\SVN\\Git. Siten et näe kuvakepäällyksiä millekään tiedostolle tai kansiolle määritellyn polun alapuolella." #. (para) #: ../source/TortoiseGit_en.xml:11664 @@ -9664,8 +9664,8 @@ msgstr " Tällä sivulla voit määrittää välityspalvelimen a #. (para) #: ../source/TortoiseGit_en.xml:11759 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." -msgstr "Jos tarvitset arkistokohtaisia välityspalvelinasaetuksia, joudut muokkaamaan Subversionin servers-tiedostoa. Napsauta Muokkaa avataksesi sen suoraan. Katso lisätietoa Subversion-kirjan luvusta Runtime Configuration Area." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgstr "Jos tarvitset arkistokohtaisia välityspalvelinasaetuksia, joudut muokkaamaan Gitin servers-tiedostoa. Napsauta Muokkaa avataksesi sen suoraan. Katso lisätietoa Git-kirjan luvusta Runtime Configuration Area." #. (para) #: ../source/TortoiseGit_en.xml:11769 @@ -9700,8 +9700,8 @@ msgstr "Kannattaa harkita tunnussanojen talletustyökalun (esim. Pageant, saatav #. (para) #: ../source/TortoiseGit_en.xml:11809 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." -msgstr "Lopuksi, SSH-asennus palvelimelle ja asiakastyöasemiin on mutkikas toimenpide, jota tämä käyttöohje ei kata. Löydät kuitenkin oppaan TortoiseGit FAQ-sivulta otsikolla Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." +msgstr "Lopuksi, SSH-asennus palvelimelle ja asiakastyöasemiin on mutkikas toimenpide, jota tämä käyttöohje ei kata. Löydät kuitenkin oppaan TortoiseGit FAQ-sivulta otsikolla Git/TortoiseGit SSH How-To." #. (title) #: ../source/TortoiseGit_en.xml:11819 @@ -9795,8 +9795,8 @@ msgstr "Jos käytät svn:keywords -ominaisuutta avainsanojen #. (para) #: ../source/TortoiseGit_en.xml:11925 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." -msgstr "Voit myös määrittää erillisen vertailutyökalun Subversion-ominaisuuksien vertailuun. Koska ne tapaavat olle lyhyitä, yksinkertaisia merkkijonoja, saatat haluta käyttää yksinkertaisempaa vertailuohjelmaa." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgstr "Voit myös määrittää erillisen vertailutyökalun Git-ominaisuuksien vertailuun. Koska ne tapaavat olle lyhyitä, yksinkertaisia merkkijonoja, saatat haluta käyttää yksinkertaisempaa vertailuohjelmaa." #. (para) #: ../source/TortoiseGit_en.xml:11930 @@ -9972,8 +9972,8 @@ msgstr "Tunnistustiedot" #. (para) #: ../source/TortoiseGit_en.xml:12158 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" -msgstr "Kun tunnistaudut Subversion-palvelimelle, käyttäjätunnus ja salasana talletetaan paikallisesti, joten niitä ei tarvitse syöttää toistamiseen. Saatat haluta tyhjentää tiedot turvallisuussyistä, tai koska haluat käyttää arkistoa eri käyttäjätunnuksella ... ja tietääkö Ville, että käytät hänen työasemaansa?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgstr "Kun tunnistaudut Git-palvelimelle, käyttäjätunnus ja salasana talletetaan paikallisesti, joten niitä ei tarvitse syöttää toistamiseen. Saatat haluta tyhjentää tiedot turvallisuussyistä, tai koska haluat käyttää arkistoa eri käyttäjätunnuksella ... ja tietääkö Ville, että käytät hänen työasemaansa?" #. (para) #: ../source/TortoiseGit_en.xml:12165 @@ -10262,8 +10262,8 @@ msgstr "Asetusikkuna, Komentojonosivu" #. (para) #: ../source/TortoiseGit_en.xml:12459 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." -msgstr " Tällä sivulla voit määrittää komentojonoja, jotka suoritetaan automaattisesti, kun joitain Subversion-toimintoja suoritetaan. Ero luvussa kuvattuihin komentojonoihin on se, että nämä komentojonot suoritetaan paikallisesti työasemassa." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgstr " Tällä sivulla voit määrittää komentojonoja, jotka suoritetaan automaattisesti, kun joitain Git-toimintoja suoritetaan. Ero luvussa kuvattuihin komentojonoihin on se, että nämä komentojonot suoritetaan paikallisesti työasemassa." #. (para) #: ../source/TortoiseGit_en.xml:12469 @@ -10342,8 +10342,8 @@ msgstr "Ennen päivitystä" #. (para) #: ../source/TortoiseGit_en.xml:12533 -msgid "Called before the actual Subversion update begins." -msgstr "Komentojonoa kutsutaan, ennen kuin Subversion-päivitys alkaa." +msgid "Called before the actual Git update begins." +msgstr "Komentojonoa kutsutaan, ennen kuin Git-päivitys alkaa." #. (term) #. (term) @@ -10454,8 +10454,8 @@ msgstr "Huomaa, että vaikka olemme nimenneet parametrit niiden käytön helpott #. (para) #: ../source/TortoiseGit_en.xml:12711 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." -msgstr "Jos haluat Subversion-toiminnon odottavan, kunnes komentojono on päättynyt, ruksaa Odota komennon päättymistä." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." +msgstr "Jos haluat Git-toiminnon odottavan, kunnes komentojono on päättynyt, ruksaa Odota komennon päättymistä." #. (para) #: ../source/TortoiseGit_en.xml:12715 @@ -10564,8 +10564,8 @@ msgstr "Muutamat harvoin käytetyt asetukset ovat saatavilla vain muokkaamalla s #. (para) #: ../source/TortoiseGit_en.xml:12839 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." -msgstr "Voit määrittää uuden paikan Subversion-määritystiedostolle muuttamalla rekisteriavainta HKCU\\Software\\TortoiseGit\\ConfigDir. Tämä vaikuttaa kaikkiin TortoiseGit-toimintoihin." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgstr "Voit määrittää uuden paikan Git-määritystiedostolle muuttamalla rekisteriavainta HKCU\\Software\\TortoiseGit\\ConfigDir. Tämä vaikuttaa kaikkiin TortoiseGit-toimintoihin." #. (term) #: ../source/TortoiseGit_en.xml:12848 @@ -10679,8 +10679,8 @@ msgstr "Oletusarvoisesti, kun haet työkopion olemassa olevaan, versioimattomaan #. (title) #: ../source/TortoiseGit_en.xml:12998 -msgid "Subversion Working Folders" -msgstr "Subversion-työkansiot" +msgid "Git Working Folders" +msgstr "Git-työkansiot" #. (primary) #: ../source/TortoiseGit_en.xml:13000 @@ -10694,8 +10694,8 @@ msgstr "_svn-kansio" #. (para) #: ../source/TortoiseGit_en.xml:13005 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." -msgstr "VS.NET 2003 ei osaa käsitellä Subversionin käyttämiä .svn-kansioita web-projektien yhteydessä. Tämä ei ole Subversionin ongelma, vaan virhe VS.NET 2003 -ohjelmassa ja sen käyttämissä Frontpage-laajennuksissa." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgstr "VS.NET 2003 ei osaa käsitellä Gitin käyttämiä .svn-kansioita web-projektien yhteydessä. Tämä ei ole Gitin ongelma, vaan virhe VS.NET 2003 -ohjelmassa ja sen käyttämissä Frontpage-laajennuksissa." #. (para) #: ../source/TortoiseGit_en.xml:13012 @@ -10704,8 +10704,8 @@ msgstr "Huomaa, että tämä ongelma on korjattu VS2005:ssa ja myöhemmissä ver #. (para) #: ../source/TortoiseGit_en.xml:13016 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." -msgstr "Versiosta 1.3 alkaen Subversion ja TortoiseGit tukevat ympäristömuuttujaa SVN_ASP_DOT_NET_HACK. Jos muuttuja on asetettu, Subversion käyttää _svn-kansioita .svn-kansioiden sijaan. Komentotulkki on käynnistettävä uudelleen, jotta muutokset tulisivat voimaan. Tavallisesti tämä tarkoittaa työaseman uudelleen käynnistämistä. Voit helpoiten asettaa muuttujan TortoiseGit-asetuksista - ks. ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgstr "Versiosta 1.3 alkaen Git ja TortoiseGit tukevat ympäristömuuttujaa SVN_ASP_DOT_NET_HACK. Jos muuttuja on asetettu, Git käyttää _svn-kansioita .svn-kansioiden sijaan. Komentotulkki on käynnistettävä uudelleen, jotta muutokset tulisivat voimaan. Tavallisesti tämä tarkoittaa työaseman uudelleen käynnistämistä. Voit helpoiten asettaa muuttujan TortoiseGit-asetuksista - ks. ." #. (para) #: ../source/TortoiseGit_en.xml:13026 @@ -10759,8 +10759,8 @@ msgstr "versionumero tiedostoissa" #. (para) #: ../source/TortoiseGit_en.xml:13077 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." -msgstr "SubWCRev on Windows-konsoliohjelma, jota voidaan käyttää lukemaan Subversion-työkopion tila ja mahdollisesti suorittamaan avainsanojen korvaus kaavaintiedostossa. Tätä käytetään usein osana ohjelmiston rakennusprosessia keinona kytkeä työkopion tilatieto rakennettavaan ohjelmaan. Tyypillisesti sitä voitaisiin käyttää esim. sisällyttämään versionumero Tietoa-ikkunaan." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgstr "SubWCRev on Windows-konsoliohjelma, jota voidaan käyttää lukemaan Git-työkopion tila ja mahdollisesti suorittamaan avainsanojen korvaus kaavaintiedostossa. Tätä käytetään usein osana ohjelmiston rakennusprosessia keinona kytkeä työkopion tilatieto rakennettavaan ohjelmaan. Tyypillisesti sitä voitaisiin käyttää esim. sisällyttämään versionumero Tietoa-ikkunaan." #. (title) #: ../source/TortoiseGit_en.xml:13091 @@ -10769,8 +10769,8 @@ msgstr "SubWCRev-komentorivi" #. (para) #: ../source/TortoiseGit_en.xml:13092 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." -msgstr "SubWCRev lukee työkopion kaikkien tiedostojen Subversion-tilan, ohittaen oletusarvoisesti ulkoiset viittaukset. Se tallettaa korkeimman löydetyn versionumeron ja sen aikaleiman; lisäksi talletetaan myös tieto siitä, onko työkopiossa paikallisia muutoksia tai useita päivitysversioita. Versionumero, päivitysversioväli ja muutostila tulostuvat konsolille." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgstr "SubWCRev lukee työkopion kaikkien tiedostojen Git-tilan, ohittaen oletusarvoisesti ulkoiset viittaukset. Se tallettaa korkeimman löydetyn versionumeron ja sen aikaleiman; lisäksi talletetaan myös tieto siitä, onko työkopiossa paikallisia muutoksia tai useita päivitysversioita. Versionumero, päivitysversioväli ja muutostila tulostuvat konsolille." #. (para) #: ../source/TortoiseGit_en.xml:13100 @@ -11267,8 +11267,8 @@ msgstr "Lukkoa luotaessa annettu viesti." #. (para) #: ../source/TortoiseGit_en.xml:13406 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " -msgstr "Jos tarvitset Subversion-versiotietoja muissa ohjelmissa, voit käyttää SubWCRev-ohjelman COM-rajapintaa. Luotava olio on SubWCRev.object, joka tukee seuraavia operaatioita: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgstr "Jos tarvitset Git-versiotietoja muissa ohjelmissa, voit käyttää SubWCRev-ohjelman COM-rajapintaa. Luotava olio on SubWCRev.object, joka tukee seuraavia operaatioita: " #. (programlisting) #: ../source/TortoiseGit_en.xml:13524 @@ -11545,8 +11545,8 @@ msgstr "UKK" #. (para) #: ../source/TortoiseGit_en.xml:13612 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "Koska TortoiseGit on koko ajan työn alla, käyttöohjeet eivät aina ole täysin ajan tasalla. Pidämme yllä FAQ-sivua (englanninkielinen), joka sisältää valikoiman TortoiseGit-postituslistoilla dev@TortoiseGit.tigris.org ja users@TortoiseGit.tigris.org usein kysyttyjä kysymyksiä." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "Koska TortoiseGit on koko ajan työn alla, käyttöohjeet eivät aina ole täysin ajan tasalla. Pidämme yllä FAQ-sivua (englanninkielinen), joka sisältää valikoiman TortoiseGit-postituslistoilla tortoisegit-dev@googlegroups.com ja tortoisegit-users@googlegroups.com usein kysyttyjä kysymyksiä." #. (para) #: ../source/TortoiseGit_en.xml:13624 @@ -11555,8 +11555,8 @@ msgstr "Pidämme myös yllä users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." -msgstr "Jos sinulla on kysymys, johon ei ole vastattu missään muualla, niin paras paikka niiden esittämiseen on jokin postituslistoista. Lista users@TortoiseGit.tigris.org on tarkoitettu TortoiseGit:n käyttöön liittyviin kysymyksiin. Jos haluat auttaa TortoiseGit:n kehittämisessä, sinun kannattaa osallistua keskusteluihin listalla dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." +msgstr "Jos sinulla on kysymys, johon ei ole vastattu missään muualla, niin paras paikka niiden esittämiseen on jokin postituslistoista. Lista tortoisegit-users@googlegroups.com on tarkoitettu TortoiseGit:n käyttöön liittyviin kysymyksiin. Jos haluat auttaa TortoiseGit:n kehittämisessä, sinun kannattaa osallistua keskusteluihin listalla tortoisegit-dev@googlegroups.com ." #. (title) #: ../source/TortoiseGit_en.xml:13650 @@ -11615,8 +11615,8 @@ msgstr "tyhjä viesti" #. (para) #: ../source/TortoiseGit_en.xml:13715 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." -msgstr "On kaksi tapaa estää käyttäjiä toimittamasta muutoksia arkistoon tyhjällä lokiviestillä. Yksi on TortoiseGit-spesifi, toinen toimii kaikilla Subversion-asiakkailla, mutta vaatii pääsyä palvelimelle." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." +msgstr "On kaksi tapaa estää käyttäjiä toimittamasta muutoksia arkistoon tyhjällä lokiviestillä. Yksi on TortoiseGit-spesifi, toinen toimii kaikilla Git-asiakkailla, mutta vaatii pääsyä palvelimelle." #. (title) #: ../source/TortoiseGit_en.xml:13721 @@ -11635,8 +11635,8 @@ msgstr "Palvelimen arkistokansiossa on kansio hooks, joka s #. (para) #: ../source/TortoiseGit_en.xml:13737 -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." -msgstr "Tätä tapaa suositellaan, jos käyttäjät käyttävät TortoiseGit:n ohella muita Subversion-asiakasohjelmia. Haittapuoli on se, että palvelin hylkää toimituksen, ja siksi käyttäjät saavat virheilmoituksen. Asiakasohjelma ei voi tietää etukäteen, että toimitus epäonnistuu. Jos haluat, että TortoiseGit-toimitusikkunan OK-painike on estetty, kun lokiviesti on liian lyhyt, niin käytä alla kuvattua tapaa." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgstr "Tätä tapaa suositellaan, jos käyttäjät käyttävät TortoiseGit:n ohella muita Git-asiakasohjelmia. Haittapuoli on se, että palvelin hylkää toimituksen, ja siksi käyttäjät saavat virheilmoituksen. Asiakasohjelma ei voi tietää etukäteen, että toimitus epäonnistuu. Jos haluat, että TortoiseGit-toimitusikkunan OK-painike on estetty, kun lokiviesti on liian lyhyt, niin käytä alla kuvattua tapaa." #. (title) #: ../source/TortoiseGit_en.xml:13748 @@ -11782,8 +11782,8 @@ msgstr "Koska TortoiseGit ei koskaan hävitä tietoa, perumasi ve #. (para) #: ../source/TortoiseGit_en.xml:13938 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." -msgstr "Ainut keino poistaa tietoa arkistosta on käyttää Subversionin svnadmin-komentorivityökalua. Löydät kuvauksen sen toiminnasta Subversion-kirjan luvusta Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgstr "Ainut keino poistaa tietoa arkistosta on käyttää Gitin svnadmin-komentorivityökalua. Löydät kuvauksen sen toiminnasta Git-kirjan luvusta Repository Maintenance." #. (title) #: ../source/TortoiseGit_en.xml:13949 @@ -11852,8 +11852,8 @@ msgstr "Aseta projektisi kansiolle svn:externals-ominaisuus. #. (para) #: ../source/TortoiseGit_en.xml:14038 -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." -msgstr "Toimita uusi kansio arkistoon. Seuraavan päivityksen yhteydessä Subversion noutaa kopion projektin kotiarkistosta työkopioosi. Alikansiot luodaan tarvittaessa automaattisesti. Aina kun päivität työkopiosi, saat myös viimeisimmän version kaikista ulkoisista projekteista." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgstr "Toimita uusi kansio arkistoon. Seuraavan päivityksen yhteydessä Git noutaa kopion projektin kotiarkistosta työkopioosi. Alikansiot luodaan tarvittaessa automaattisesti. Aina kun päivität työkopiosi, saat myös viimeisimmän version kaikista ulkoisista projekteista." #. (para) #: ../source/TortoiseGit_en.xml:14057 @@ -11867,7 +11867,7 @@ msgstr "Käytä sisäkkäistä työkopiota" #. (para) #: ../source/TortoiseGit_en.xml:14066 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" msgstr "Luo projektiisi uusi kansio, johon jaettu komponentti on tarkoitus lisätä, mutta älä tee siitä versioitua." #. (para) @@ -12452,8 +12452,8 @@ msgstr "Koska kaikkia TortoiseGit-komentoja voi ohjata komentorivivalitsimilla, #. (para) #: ../source/TortoiseGit_en.xml:14573 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." -msgstr "Muista, että TortoiseGit on graafinen käyttöliittymä Subversioniin - niinpä tämä automaatio-opas näyttääkin, miten saada TortoiseGit:n ikkunat aukeamaan odottamaan käyttäjän syötteitä. Jos haluat käyttää komentoja, jotka eivät tarvitse syötteitä, sinun on sen sijaan käytettävä virallista Subversion-komentoriviasiakasta." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." +msgstr "Muista, että TortoiseGit on graafinen käyttöliittymä Gitiin - niinpä tämä automaatio-opas näyttääkin, miten saada TortoiseGit:n ikkunat aukeamaan odottamaan käyttäjän syötteitä. Jos haluat käyttää komentoja, jotka eivät tarvitse syötteitä, sinun on sen sijaan käytettävä virallista Git-komentoriviasiakasta." #. (title) #. (title) @@ -13074,18 +13074,18 @@ msgstr "CLI" #. (para) #: ../source/TortoiseGit_en.xml:15167 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." -msgstr "Tämä käyttöohje viittaa toisinaan Subversion-kirjaan (englanninkielinen), joka kuvaa Subversionin käyttöä komentoriviltä (command line interface, CLI). Jotta saisit paremman käsityksen TortoiseGit:n toiminnasta, olemme koonneet luettelon graafisen käyttöliittymän komentoja vastaavista komentoriviasiakkaan komennoista." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgstr "Tämä käyttöohje viittaa toisinaan Git-kirjaan (englanninkielinen), joka kuvaa Gitin käyttöä komentoriviltä (command line interface, CLI). Jotta saisit paremman käsityksen TortoiseGit:n toiminnasta, olemme koonneet luettelon graafisen käyttöliittymän komentoja vastaavista komentoriviasiakkaan komennoista." #. (para) #: ../source/TortoiseGit_en.xml:15176 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." -msgstr "Vaikka TortoiseGit-komennoille on CLI-vastineensa, muista, että TortoiseGit ei käytä CLI:tä vaan kytkeytyy suoraan Subversion-kirjastoihin." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." +msgstr "Vaikka TortoiseGit-komennoille on CLI-vastineensa, muista, että TortoiseGit ei käytä CLI:tä vaan kytkeytyy suoraan Git-kirjastoihin." #. (para) #: ../source/TortoiseGit_en.xml:15182 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." -msgstr "Jos luulet löytäneesi virheen TortoiseGit:stä, saatamme pyytää sinua koettamaan sen aikaan saamista CLI:n avulla, jotta voimme erotta TortoiseGit-ongelmat Subversion-ongelmista. Tämä luku kertoo, mitä komentoja siihen tulee käyttää." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." +msgstr "Jos luulet löytäneesi virheen TortoiseGit:stä, saatamme pyytää sinua koettamaan sen aikaan saamista CLI:n avulla, jotta voimme erotta TortoiseGit-ongelmat Git-ongelmista. Tämä luku kertoo, mitä komentoja siihen tulee käyttää." #. (title) #: ../source/TortoiseGit_en.xml:15190 @@ -13148,8 +13148,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15240 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." -msgstr "Usean kohteen päivitys ei nykyisin ole atominen toiminto Subversionissa. TortoiseGit etsii ensin arkiston HEAD-version ja päivittää sitten kaikki kohteet tuohon versionumeroon välttääkseen työkopion sekaversiointia." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgstr "Usean kohteen päivitys ei nykyisin ole atominen toiminto Gitissa. TortoiseGit etsii ensin arkiston HEAD-version ja päivittää sitten kaikki kohteet tuohon versionumeroon välttääkseen työkopion sekaversiointia." #. (para) #: ../source/TortoiseGit_en.xml:15247 @@ -13185,8 +13185,8 @@ msgstr "Jos Päivitä vain ylin hakemistotaso on valittu, k #. (para) #: ../source/TortoiseGit_en.xml:15275 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." -msgstr "TortoiseGit:n toimitusikkuna käyttää useita Subversion-komentoja. Ensimmäinen vaihe on tilatarkistus, joka tutkii, mitä tiedostoja ja kansioita työkopiostasi voidaan mahdollisesti toimittaa arkistoon. Voit tutkia listaa, vertailla tiedostoja BASE-versiota vasten ja valita ne kohteet, jotka haluat mukaan toimitukseen." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgstr "TortoiseGit:n toimitusikkuna käyttää useita Git-komentoja. Ensimmäinen vaihe on tilatarkistus, joka tutkii, mitä tiedostoja ja kansioita työkopiostasi voidaan mahdollisesti toimittaa arkistoon. Voit tutkia listaa, vertailla tiedostoja BASE-versiota vasten ja valita ne kohteet, jotka haluat mukaan toimitukseen." #. (screen) #. (screen) @@ -13206,8 +13206,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15285 #: ../source/TortoiseGit_en.xml:15373 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." -msgstr "Jos Näytä versioimattomat tiedostot on valittu, TortoiseGit luettelee myös versioimattomat tiedostot ja kansiot työkopiohierarkiassa (ottaen huomioon ohitussäännöt). Tällä ominaisuudella ei ole suoraa vastinetta Subversionissa, koska komento svn status ei etene versioimattomiin kansioihin." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." +msgstr "Jos Näytä versioimattomat tiedostot on valittu, TortoiseGit luettelee myös versioimattomat tiedostot ja kansiot työkopiohierarkiassa (ottaen huomioon ohitussäännöt). Tällä ominaisuudella ei ole suoraa vastinetta Gitissa, koska komento svn status ei etene versioimattomiin kansioihin." #. (para) #: ../source/TortoiseGit_en.xml:15293 @@ -13228,8 +13228,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15300 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." -msgstr "Kun napsautat OK, Subversion-toimitus käynnistyy. Jos olet jättänyt kaikki tiedostovalinnan oletustilaansa, TortoiseGit käyttää yhtä palautuvaa (rekursiivista) toimitusta työkopiolle. Jos jätät tiedostoja pois toimituksesta, TortoiseGit:n on käytettävä ei-palautuvaa (-N) toimitusta, ja kaikki polut annetaan erikseen komentorivillä." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgstr "Kun napsautat OK, Git-toimitus käynnistyy. Jos olet jättänyt kaikki tiedostovalinnan oletustilaansa, TortoiseGit käyttää yhtä palautuvaa (rekursiivista) toimitusta työkopiolle. Jos jätät tiedostoja pois toimituksesta, TortoiseGit:n on käytettävä ei-palautuvaa (-N) toimitusta, ja kaikki polut annetaan erikseen komentorivillä." #. (screen) #: ../source/TortoiseGit_en.xml:15308 @@ -13292,7 +13292,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15348 msgid "By default, TortoiseGit tries to fetch 100 log messages using the --limit method. If the settings instruct it to use old APIs, then the second form is used to fetch the log messages for 100 repository revisions." -msgstr "Oletusarvoisesti TortoiseGit yritää hakea sata lokiviestiä käyttämällä --limit -menetelmää. Jos asetukset ohjaavat sen käyttämään vanhaa Subversion-APIa, niin lokiviestit haetaan yksitellen sadalle arkistoversiolle." +msgstr "Oletusarvoisesti TortoiseGit yritää hakea sata lokiviestiä käyttämällä --limit -menetelmää. Jos asetukset ohjaavat sen käyttämään vanhaa Git-APIa, niin lokiviestit haetaan yksitellen sadalle arkistoversiolle." #. (para) #: ../source/TortoiseGit_en.xml:15354 @@ -13415,8 +13415,8 @@ msgstr "Ensimmäsessä vaiheessa tehdään tilatarkistus, joka määrittää, mi #. (para) #: ../source/TortoiseGit_en.xml:15453 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." -msgstr "Kun napsautat OK, Subversionin revert-toiminto käynnistyy. Jos jätit kaikki valinnat oletusarvoihinsa, TortoiseGit suorittaa toiminnon palautuvasti (-R) työkopiolle. Jos muutat valintoja, jokainen polku on annettava erikseen revert-komennon komentorivillä." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgstr "Kun napsautat OK, Gitin revert-toiminto käynnistyy. Jos jätit kaikki valinnat oletusarvoihinsa, TortoiseGit suorittaa toiminnon palautuvasti (-R) työkopiolle. Jos muutat valintoja, jokainen polku on annettava erikseen revert-komennon komentorivillä." #. (screen) #: ../source/TortoiseGit_en.xml:15460 @@ -13570,8 +13570,8 @@ msgstr " " #. (para) #: ../source/TortoiseGit_en.xml:15555 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." -msgstr "Työkopion vienti eri paikkaan tehdään käyttämättä Subversion-kirjastoa, joten sille ei ole komentorivivastinetta." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." +msgstr "Työkopion vienti eri paikkaan tehdään käyttämättä Git-kirjastoa, joten sille ei ole komentorivivastinetta." #. (para) #: ../source/TortoiseGit_en.xml:15560 @@ -13681,8 +13681,8 @@ msgstr "TortoiseGit luo paikkatiedoston unified diff-muodossa vertaamalla työko #. (para) #: ../source/TortoiseGit_en.xml:15641 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." -msgstr "Paikkatiedoston käyttäminen voi olla mutkikasta, jos paikka ja työkopio eivät ole samassa versiossa. Mahdolliset ristiriidat ratkaistaan TortoiseMergellä, jolla ei ole suoraa vastinetta Subversionissa." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." +msgstr "Paikkatiedoston käyttäminen voi olla mutkikasta, jos paikka ja työkopio eivät ole samassa versiossa. Mahdolliset ristiriidat ratkaistaan TortoiseMergellä, jolla ei ole suoraa vastinetta Gitissa." #. (title) #: ../source/TortoiseGit_en.xml:15655 @@ -13701,8 +13701,8 @@ msgstr "kuvakepäällysten prioriteetti" #. (para) #: ../source/TortoiseGit_en.xml:15670 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." -msgstr "Jokaisella tiedostolla ja kansiolla on Subversion-kirjaston raportoima tila. Komentoriviasiakas näyttää tilat kirjainkoodeina, mutta TortoiseGit näyttää ne graafisesti kuvakepäällysten avulla. Koska päällysten määrä on rajoitettu, kukin päällys saattaa esittää useaa tilaa." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgstr "Jokaisella tiedostolla ja kansiolla on Git-kirjaston raportoima tila. Komentoriviasiakas näyttää tilat kirjainkoodeina, mutta TortoiseGit näyttää ne graafisesti kuvakepäällysten avulla. Koska päällysten määrä on rajoitettu, kukin päällys saattaa esittää useaa tilaa." #. (para) #: ../source/TortoiseGit_en.xml:15678 @@ -13726,13 +13726,13 @@ msgstr " Kuvakepäällystä The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." -msgstr " Kuvakepäällystä versioitu käytetään kuvaamaan tilaa normaali tai versioitua kohdetta, jonka tilaa ei vielä tiedetä. Koska TortoiseGit käyttää taustaprosessia tilatietojen haluun, kuvakepäällyksen päivittymiseen saattaa mennä muutama sekunti." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgstr " Kuvakepäällystä versioitu käytetään kuvaamaan tilaa normaali tai versioitua kohdetta, jonka tilaa ei vielä tiedetä. Koska TortoiseGit käyttää taustaprosessia tilatietojen haluun, kuvakepäällyksen päivittymiseen saattaa mennä muutama sekunti." #. (para) #: ../source/TortoiseGit_en.xml:15721 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." -msgstr " Kuvakepäällystä tarvitsee lukon käytetään näyttämään, että tiedostolla on svn:needs-lock -ominaisuus asetettuna. Versiosta 1.4 alkaen Subversion tallettaa svn:needs-lock -ominaisuuden tilan paikallisesti ja sitä käytetään selvittämään, milloin kuvakepäällys näytetään. Ennen versiota 1.4 olevissa työkopioissa kuvakepäällys näytetään, kun tiedosto on vain luku-tilassa Huomaa, että Subversion päivittää työkopiosi version automaattisesti päivityksen yhteydessä, vaikka svn:needs-lock omainaisuuden talletus ei ehkä tapahdukaan, ennen kuin tiedosto itse päivitetään." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgstr " Kuvakepäällystä tarvitsee lukon käytetään näyttämään, että tiedostolla on svn:needs-lock -ominaisuus asetettuna. Versiosta 1.4 alkaen Git tallettaa svn:needs-lock -ominaisuuden tilan paikallisesti ja sitä käytetään selvittämään, milloin kuvakepäällys näytetään. Ennen versiota 1.4 olevissa työkopioissa kuvakepäällys näytetään, kun tiedosto on vain luku-tilassa Huomaa, että Git päivittää työkopiosi version automaattisesti päivityksen yhteydessä, vaikka svn:needs-lock omainaisuuden talletus ei ehkä tapahdukaan, ennen kuin tiedosto itse päivitetään." #. (para) #: ../source/TortoiseGit_en.xml:15735 @@ -13751,13 +13751,13 @@ msgstr " Kuvakepäällystä none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." -msgstr "Jos tiedostolla on Subversion-tila pois käytöstä (kohde ei ole työkopiossa), kuvakepäällystä ei näytetä. Jos olet estänyt ohitettujen ja versioimattomien kuvakkeiden käytön, päällyksiä ei näytetä myöskään näille kohteille." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgstr "Jos tiedostolla on Git-tila pois käytöstä (kohde ei ole työkopiossa), kuvakepäällystä ei näytetä. Jos olet estänyt ohitettujen ja versioimattomien kuvakkeiden käytön, päällyksiä ei näytetä myöskään näille kohteille." #. (para) #: ../source/TortoiseGit_en.xml:15763 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." -msgstr "Kohteella voi olla vain yksi Subversion-tila. Tiedostoa voi olla esimerkiksi muutettu paikallisesti ja merkitty samalla kertaa poistettavaksi. Subversion palauttaa kuitenkin vain yhden tilan - tässä tapauksessa poistettu (Subversion määritelee tilojen suhteet)." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." +msgstr "Kohteella voi olla vain yksi Git-tila. Tiedostoa voi olla esimerkiksi muutettu paikallisesti ja merkitty samalla kertaa poistettavaksi. Git palauttaa kuitenkin vain yhden tilan - tässä tapauksessa poistettu (Git määritelee tilojen suhteet)." #. (para) #: ../source/TortoiseGit_en.xml:15770 @@ -13801,23 +13801,23 @@ msgstr "Svnserven turvaaminen SSH-tekniikalla" #. (para) #: ../source/TortoiseGit_en.xml:15833 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." -msgstr "Tässä luvussa kuvataan, miten svn+ssh -yhteyskäytäntö määritellään Subversionille ja TortoiseGit:lle. Jos käytät jo ennestään todennettuja SSH-yhteyksiä palvelimelle kirjautumiseen, olet jo perillä - tarvittaessa löydät lisää yksityiskohtia Subversion-kirjasta. Jos et vielä käytä SSH:ta, mutta haluaisit tehdä niin Subversion-asennuksesi turvaamiseksi, niin tämä ohje kuvaa yksinkertaisen tavan, johon ei liity erillisen SSH-käyttäjätilin luomista jokaista Subversion-käyttäjää varten." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." +msgstr "Tässä luvussa kuvataan, miten svn+ssh -yhteyskäytäntö määritellään Gitille ja TortoiseGit:lle. Jos käytät jo ennestään todennettuja SSH-yhteyksiä palvelimelle kirjautumiseen, olet jo perillä - tarvittaessa löydät lisää yksityiskohtia Git-kirjasta. Jos et vielä käytä SSH:ta, mutta haluaisit tehdä niin Git-asennuksesi turvaamiseksi, niin tämä ohje kuvaa yksinkertaisen tavan, johon ei liity erillisen SSH-käyttäjätilin luomista jokaista Git-käyttäjää varten." #. (para) #: ../source/TortoiseGit_en.xml:15843 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." -msgstr "Tämän ohje perustuu ideaan, että kaikki Subversion-käyttäjät jakavat yhden SSH-tilin, ja käyttäjät erotellaan toisistaan eri todennusavaimilla." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." +msgstr "Tämän ohje perustuu ideaan, että kaikki Git-käyttäjät jakavat yhden SSH-tilin, ja käyttäjät erotellaan toisistaan eri todennusavaimilla." #. (para) #: ../source/TortoiseGit_en.xml:15848 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." -msgstr "Oletamme, että olet jo asentanut Subversion-työkalut ja luonut arkiston tässä käyttöohjeessa toisaalla kuvatulla tavalla. Huomaa, että sinun ei tule käynnistää svnserve-ohjelmaa palveluna tai demonina, kun sitä käytetään yhdessä SSH:n kanssa." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgstr "Oletamme, että olet jo asentanut Git-työkalut ja luonut arkiston tässä käyttöohjeessa toisaalla kuvatulla tavalla. Huomaa, että sinun ei tule käynnistää svnserve-ohjelmaa palveluna tai demonina, kun sitä käytetään yhdessä SSH:n kanssa." #. (para) #: ../source/TortoiseGit_en.xml:15854 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" -msgstr "Seuraava teksti on suurelta osin peräisin Marc Logemannin kirjoittamasta ohjeesta, joka löytyy sivustosta www.logemann.org. Windows-palvelimen määrittelyyn liittyvät ohjeet on kirjoittanut Thorsten Müller. Kiitos molemmille!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgstr "Seuraava teksti on suurelta osin peräisin Marc Logemannin kirjoittamasta ohjeesta, joka löytyy sivustosta www.logemann.org. Windows-palvelimen määrittelyyn liittyvät ohjeet on kirjoittanut Thorsten Müller. Kiitos molemmille!" #. (title) #: ../source/TortoiseGit_en.xml:15865 @@ -13837,8 +13837,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15875 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." -msgstr "Yksi huomion arvoinen asia on, että jos käännät Subversionin itse etkä anna parametreja komennolle ./configure, Subversion luo bin-hakemiston kansioon /usr/local ja sijoittaa käännöstulokset sinne. Jos haluat käyttää tunnelointia SSH:n kanssa, sinun on syytä muistaa, että SSH:n avulla kirjautuvan käyttäjän on suoritettava snserve sekä muita ohjelmia. Tästä syystä kannattaa lisätä /usr/local/bin PATH-ympäristömuuttujaan tai luoda symbolisia linkkejä ohjelmistasi hakemistoon /usr/sbin (mikä tahansa PATH-muuttujassa oleva hakemisto käy myös)." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgstr "Yksi huomion arvoinen asia on, että jos käännät Gitin itse etkä anna parametreja komennolle ./configure, Git luo bin-hakemiston kansioon /usr/local ja sijoittaa käännöstulokset sinne. Jos haluat käyttää tunnelointia SSH:n kanssa, sinun on syytä muistaa, että SSH:n avulla kirjautuvan käyttäjän on suoritettava snserve sekä muita ohjelmia. Tästä syystä kannattaa lisätä /usr/local/bin PATH-ympäristömuuttujaan tai luoda symbolisia linkkejä ohjelmistasi hakemistoon /usr/sbin (mikä tahansa PATH-muuttujassa oleva hakemisto käy myös)." #. (para) #: ../source/TortoiseGit_en.xml:15888 @@ -13999,8 +13999,8 @@ msgstr "Yhteyden testaus TortoiseGit-ohjelmalla" #. (para) #: ../source/TortoiseGit_en.xml:16038 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." -msgstr "Tähän mennessä olemme vain testanneet, että kykenet kirjautumaan palvelimelle SSH:n avulla. Seuraavaksi varmistamme, että SSH-yhteys kykenee suorittamaan svnserve-ohjelman. Jotta useat Subversion-käyttäjät voivat jakaa svnuser-tunnuksen, muokkaa tiedostoa /home/svnuser/.ssh/authorized_keys palvelimella seuraavasti. Koska kaikilla Subversion-käyttäjillä on sama kirjautumisnimi, mutta eri todennusavain, joudut lisäämään yhden rivin kullekin käyttäjälle." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." +msgstr "Tähän mennessä olemme vain testanneet, että kykenet kirjautumaan palvelimelle SSH:n avulla. Seuraavaksi varmistamme, että SSH-yhteys kykenee suorittamaan svnserve-ohjelman. Jotta useat Git-käyttäjät voivat jakaa svnuser-tunnuksen, muokkaa tiedostoa /home/svnuser/.ssh/authorized_keys palvelimella seuraavasti. Koska kaikilla Git-käyttäjillä on sama kirjautumisnimi, mutta eri todennusavain, joudut lisäämään yhden rivin kullekin käyttäjälle." #. (para) #: ../source/TortoiseGit_en.xml:16047 @@ -14025,7 +14025,7 @@ msgstr "<ReposRootPath> tulee korvata polulla hakemisto #. (para) #: ../source/TortoiseGit_en.xml:16065 msgid "<author> should be replaced with the svn author that you want to be stored on commit. This also allows svnserve to use its own access rights within svnserve.conf." -msgstr "<author> korvataan sen Subversion-käyttäjän nimellä, jonka haluat tallettuvan toimituksen yhteydessä. Tämä sallii myös svnserven käyttää omia saantioikeuksiaan tiedostossa svnserve.conf." +msgstr "<author> korvataan sen Git-käyttäjän nimellä, jonka haluat tallettuvan toimituksen yhteydessä. Tämä sallii myös svnserven käyttää omia saantioikeuksiaan tiedostossa svnserve.conf." #. (para) #: ../source/TortoiseGit_en.xml:16070 @@ -14035,7 +14035,7 @@ msgstr "<PublicKey> korvataan aiemmin luomallasi julkis #. (para) #: ../source/TortoiseGit_en.xml:16074 msgid "<Comment> can be any comment you like, but it is useful for mapping an svn author name to the person's real name." -msgstr "<Comment> voi sisältää haluamasi kommentin; sen avulla voi esimerkiksi näppärästä kytkeä Subversion-käyttäjän nimen henkilön oikeaan nimeen." +msgstr "<Comment> voi sisältää haluamasi kommentin; sen avulla voi esimerkiksi näppärästä kytkeä Git-käyttäjän nimen henkilön oikeaan nimeen." #. (para) #: ../source/TortoiseGit_en.xml:16078 @@ -14119,8 +14119,8 @@ msgstr "Sanasto" #. (para) #: ../source/TortoiseGit_en.xml:16190 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Subversion-komento, jota käytetään lisäämään tiedosto tai kansio työkopioosi. Uudet kohteet lisätään arkistoon, kun teet toimituksen." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Git-komento, jota käytetään lisäämään tiedosto tai kansio työkopioosi. Uudet kohteet lisätään arkistoon, kun teet toimituksen." #. (glossterm) #: ../source/TortoiseGit_en.xml:16198 @@ -14145,7 +14145,7 @@ msgstr "BDB" #. (para) #: ../source/TortoiseGit_en.xml:16223 msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." -msgstr "Berkeley-tietokanta. Koeteltu ja vakaa Subversion-arkiston toteuttamistekniikka, jota ei voi käyttää verkkojakojen kanssa. Oletustekniikka ennen Subversion-versiota 1.2." +msgstr "Berkeley-tietokanta. Koeteltu ja vakaa Git-arkiston toteuttamistekniikka, jota ei voi käyttää verkkojakojen kanssa. Oletustekniikka ennen Git-versiota 1.2." #. (glossterm) #: ../source/TortoiseGit_en.xml:16230 @@ -14154,23 +14154,23 @@ msgstr "Haara" #. (para) #: ../source/TortoiseGit_en.xml:16232 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Versionhallintajärjestelmissä käytetty termi, joka kuvaa tilannetta, jossa ohjelmiston kehitys eriytyy kahdelle eri polulle. Voit luoda haaran pääkehityshaarasta (usein \"trunk\") kehittääksesi uutta ominaisuutta ilman, että pääkehityshaara muuttuu epävakaaksi. Voit myös tehdä vakautushaaran, johon korjataan vain virheitä, samalla kun uudet ominaisuudet lisätään (epävakaaseen) päähaaraan. Subversionissa haarat on toteutettu halpoina kopioina." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Versionhallintajärjestelmissä käytetty termi, joka kuvaa tilannetta, jossa ohjelmiston kehitys eriytyy kahdelle eri polulle. Voit luoda haaran pääkehityshaarasta (usein \"trunk\") kehittääksesi uutta ominaisuutta ilman, että pääkehityshaara muuttuu epävakaaksi. Voit myös tehdä vakautushaaran, johon korjataan vain virheitä, samalla kun uudet ominaisuudet lisätään (epävakaaseen) päähaaraan. Gitissa haarat on toteutettu halpoina kopioina." #. (para) #: ../source/TortoiseGit_en.xml:16247 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Subversion-komento, joka luo paikallisen työkopion tyhjään hakemistoon noutamalla versioidut tiedostot arkistosta." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Git-komento, joka luo paikallisen työkopion tyhjään hakemistoon noutamalla versioidut tiedostot arkistosta." #. (para) #: ../source/TortoiseGit_en.xml:16256 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Lainaus Subversion-kirjasta: Siivoa työkopio palautuvasti, poistamalla lukitukset ja jatkamalla kesken jääneitä toimintoja. Jos törmäät joskus virheeseen työkopio lukittu, suorita tämä komento poistaaksesi vanhentuneet lukot ja saadaksesi työkopiosi jälleen käyttökelpoiseksi. Huomaa, että tässä yhteydessä lukitus viittaa tiedostojärjestelmän lukitukseen, ei arkiston lukkoihin." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Lainaus Git-kirjasta: Siivoa työkopio palautuvasti, poistamalla lukitukset ja jatkamalla kesken jääneitä toimintoja. Jos törmäät joskus virheeseen työkopio lukittu, suorita tämä komento poistaaksesi vanhentuneet lukot ja saadaksesi työkopiosi jälleen käyttökelpoiseksi. Huomaa, että tässä yhteydessä lukitus viittaa tiedostojärjestelmän lukitukseen, ei arkiston lukkoihin." #. (para) #: ../source/TortoiseGit_en.xml:16273 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Tämä Subversion-komento siirtää muutokset paikallisesta työkopiostasi arkistoon, luoden samalla uuden arkistoversion." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Tämä Git-komento siirtää muutokset paikallisesta työkopiostasi arkistoon, luoden samalla uuden arkistoversion." #. (glossterm) #: ../source/TortoiseGit_en.xml:16281 @@ -14179,8 +14179,8 @@ msgstr "Ristiriita" #. (para) #: ../source/TortoiseGit_en.xml:16283 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Kun arkiston muutokset yhdistetään paikallisiin muutoksiin, ne ovat joskus samojen tiedostojen samoilla riveillä. Tässä tapauksessa Subversion ei voi automaattisesti päättää, mitä versiota käyttää - tiedoston sanotaan olevan ristiriitainen. Sinun on muokattava tiedostoa käsin ja ratkaistava ristiriita ennen kuin voit toimittaa uusia muutoksia arkistoon." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Kun arkiston muutokset yhdistetään paikallisiin muutoksiin, ne ovat joskus samojen tiedostojen samoilla riveillä. Tässä tapauksessa Git ei voi automaattisesti päättää, mitä versiota käyttää - tiedoston sanotaan olevan ristiriitainen. Sinun on muokattava tiedostoa käsin ja ratkaistava ristiriita ennen kuin voit toimittaa uusia muutoksia arkistoon." #. (glossterm) #: ../source/TortoiseGit_en.xml:16293 @@ -14189,8 +14189,8 @@ msgstr "Kopio" #. (para) #: ../source/TortoiseGit_en.xml:16295 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "Subversion-arkistossa voi kopioida yksittäisiä tiedostoja tai kokonaisen puun. Nämä toiminnot on toteutettu halpoina kopioina, jotka ovat ikään kuin linkkejä alkuperäiseen ja vievät siten erittäin vähän tilaa. Kopiointi säilyttää kohteen historian kopiossa, joten voit jäljittää muutoksia, jotka tehtiin ennen kopion tekoa." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "Git-arkistossa voi kopioida yksittäisiä tiedostoja tai kokonaisen puun. Nämä toiminnot on toteutettu halpoina kopioina, jotka ovat ikään kuin linkkejä alkuperäiseen ja vievät siten erittäin vähän tilaa. Kopiointi säilyttää kohteen historian kopiossa, joten voit jäljittää muutoksia, jotka tehtiin ennen kopion tekoa." #. (para) #: ../source/TortoiseGit_en.xml:16307 @@ -14214,8 +14214,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:16338 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Subversionin tiedostojärjestelmä, jota käytetään arkistojen toteutustekniikkana. Voidaan käyttää verkkojakojen kanssa. Oletustekniikka Subversion-versiosta 1.2 eteenpäin." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Gitin tiedostojärjestelmä, jota käytetään arkistojen toteutustekniikkana. Voidaan käyttää verkkojakojen kanssa. Oletustekniikka Git-versiosta 1.2 eteenpäin." #. (para) #: ../source/TortoiseGit_en.xml:16347 @@ -14234,8 +14234,8 @@ msgstr "Tiedoston tai kansion viimeisin versio arkistossa." #. (para) #: ../source/TortoiseGit_en.xml:16363 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "Subversion-komento, joka tuo kokonaisen kansiohierarkian arkistoon yhtenä versiona." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." +msgstr "Git-komento, joka tuo kokonaisen kansiohierarkian arkistoon yhtenä versiona." #. (para) #: ../source/TortoiseGit_en.xml:16372 @@ -14279,8 +14279,8 @@ msgstr "Paikka" #. (para) #: ../source/TortoiseGit_en.xml:16416 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Jos työkopiossa on muutoksia vain tekstitiedostoihin, on mahdollista käyttää Subversionin Vertaa-komentoa (diff) näiden muutosten kuvaamiseksi yhdessä tiedostossa unified diff-muodossa. Tällaista tiedostoa kutsutaan usein Paikaksi (patch), ja se voidaan välittää sähköpostilla jollekulle ja käyttää toisessa työkopiossa. Henkilö, jolla ei ole toimitusoikeuksia, voi toimittaa paikkatiedoston kehittäjälle, jolla tällainen oikeus on. Paikan voi myös lähettää postituslistalle katselmoitavaksi." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Jos työkopiossa on muutoksia vain tekstitiedostoihin, on mahdollista käyttää Gitin Vertaa-komentoa (diff) näiden muutosten kuvaamiseksi yhdessä tiedostossa unified diff-muodossa. Tällaista tiedostoa kutsutaan usein Paikaksi (patch), ja se voidaan välittää sähköpostilla jollekulle ja käyttää toisessa työkopiossa. Henkilö, jolla ei ole toimitusoikeuksia, voi toimittaa paikkatiedoston kehittäjälle, jolla tällainen oikeus on. Paikan voi myös lähettää postituslistalle katselmoitavaksi." #. (glossterm) #: ../source/TortoiseGit_en.xml:16429 @@ -14289,8 +14289,8 @@ msgstr "Ominaisuus" #. (para) #: ../source/TortoiseGit_en.xml:16431 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Tiedostojen ja kansioiden versioinnin lisäksi Subversion sallii versioidun metatiedon (ominaisuuksien) lisäämisen yksittäisille tiedostoille ja kansioille. Kullakin ominaisuudella on nimi ja arvo (vrt. rekisteriavain). Subversion käyttää sisäisesti muutamia ominaisuuksia, joilla on erityismerkitys (esim. svn:eol-style). Sama pätee TortoiseGit:ään (esim. tsvn:logminsize). Voit myös vapaasti lisätä omia ominaisuuksiasi." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Tiedostojen ja kansioiden versioinnin lisäksi Git sallii versioidun metatiedon (ominaisuuksien) lisäämisen yksittäisille tiedostoille ja kansioille. Kullakin ominaisuudella on nimi ja arvo (vrt. rekisteriavain). Git käyttää sisäisesti muutamia ominaisuuksia, joilla on erityismerkitys (esim. svn:eol-style). Sama pätee TortoiseGit:ään (esim. tsvn:logminsize). Voit myös vapaasti lisätä omia ominaisuuksiasi." #. (para) #: ../source/TortoiseGit_en.xml:16446 @@ -14319,8 +14319,8 @@ msgstr "Kun työkopion tiedostot jäävät yhdistämisen jälkeen ristiriitatila #. (para) #: ../source/TortoiseGit_en.xml:16486 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion säilyttää paikallista alkuperäistä kopiota jokaisesta tiedostosta sellaisena, kuin se oli viimeisen työkopion päivityksen yhteydessä. Jos teet muutoksia ja päätät perua ne, voit käyttää komentoa palauta palauttaaksesi alkuperäisen version." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git säilyttää paikallista alkuperäistä kopiota jokaisesta tiedostosta sellaisena, kuin se oli viimeisen työkopion päivityksen yhteydessä. Jos teet muutoksia ja päätät perua ne, voit käyttää komentoa palauta palauttaaksesi alkuperäisen version." #. (glossterm) #: ../source/TortoiseGit_en.xml:16495 @@ -14354,13 +14354,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:16527 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Subversionista usein käytetty lyhenne" +msgid "A frequently-used abbreviation for Git." +msgstr "Gitista usein käytetty lyhenne" #. (para) #: ../source/TortoiseGit_en.xml:16530 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Erityisen Subversion-yhteyskäytännön nimi, jota käyttää svnserve -arkistopalvelu." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Erityisen Git-yhteyskäytännön nimi, jota käyttää svnserve -arkistopalvelu." #. (para) #: ../source/TortoiseGit_en.xml:16539 @@ -14369,8 +14369,8 @@ msgstr "Samoin kuin päivitä-versioon muuttaa työkopion aikaikk #. (para) #: ../source/TortoiseGit_en.xml:16553 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Tämä Subversion-komento hakee viimeisimmät muutokset arkistosta työkopioosi, yhdistäen muitten mahdollisesti tekemät muutokset paikallisiin muutoksiisi." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Tämä Git-komento hakee viimeisimmät muutokset arkistosta työkopioosi, yhdistäen muitten mahdollisesti tekemät muutokset paikallisiin muutoksiisi." #. (glossterm) #: ../source/TortoiseGit_en.xml:16561 @@ -14412,24 +14412,24 @@ msgstr "Käännös" #~ msgstr "" #~ "Versiograafi sisältää useita eri tyyppisiä solmuja: " #~ msgid "" -#~ "Subversion uses the / as the path delimiter in all " +#~ "Git uses the / as the path delimiter in all " #~ "internal pathnames, and all pattern matching is done against this style " #~ "of path names. If you want to use a path delimiter in your ignore " #~ "pattern, be sure to use /, and not the Windows " #~ "backslash." #~ msgstr "" -#~ "Subversion käyttää /-merkkiä polkuerottimena " +#~ "Git käyttää /-merkkiä polkuerottimena " #~ "arkistopoluissa, ja kaikki hahmontäsmäys tehdään käyttäen tämän tyylisiä " #~ "polkunimiä. Jos haluat käyttää polkuerotinta ohituslausekkeessasi, muista " #~ "käyttää /-merkkiä Windows-kenoviivan sijaan." #~ msgid "" -#~ "Subversion uses this pattern matching against every path presented to it " +#~ "Git uses this pattern matching against every path presented to it " #~ "for action. These paths are generally relative to the directory being " #~ "acted upon for import, add, commit, etc. The matching pattern therefore " #~ "has to take account of the fact that there may or may not be path " #~ "components before the filename." #~ msgstr "" -#~ "Subversion käyttää hahmontäsmäystä kaikkiin sille jonkun toimenpiteen " +#~ "Git käyttää hahmontäsmäystä kaikkiin sille jonkun toimenpiteen " #~ "yhteydessä annettuihin polkuihin. Nämä polut ovat yleensä suhteellisia " #~ "siihen hakemistoon, jossa toimenpide (esim. tuonti, lisäys, toimitus, " #~ "jne.) tapahtuu. Täsmäyslausekkeen pitää ottaa huomioon, että " @@ -14440,14 +14440,14 @@ msgstr "Käännös" #~ "Fred.c but not subdir/Fred.c. This " #~ "is significant if you add a folder which contains some files that you " #~ "want to be ignored, because those filenames will be preceded with the " -#~ "folder name when Subversion compares them with the ignore pattern." +#~ "folder name when Git compares them with the ignore pattern." #~ msgstr "" #~ "Jos polussa on hakemistonimiä, täsmäysalgoritmi ei poista niitä, joten " #~ "hahmo Fred.* täsmää tiedoston Fred.c mutta ei polkunimen subdir/Fred.c kanssa. " #~ "Tämä on oleellista, kun lisäät versionhallintaan kansion, joka sisältää " #~ "tiedostoja jotka haluat ohitettavan - tällöin kaikkia lisättäviä " -#~ "tiedostonimiä edeltää polkunimi, kun Subversion vertaa niitä " +#~ "tiedostonimiä edeltää polkunimi, kun Git vertaa niitä " #~ "ohituslausekkeeseen." #~ msgid "" #~ "The / character is not treated in any special way for " diff --git a/doc/po/TortoiseSVN_fr.po b/doc/po/TortoiseSVN_fr.po index e94ebf4..2583fa4 100644 --- a/doc/po/TortoiseSVN_fr.po +++ b/doc/po/TortoiseSVN_fr.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2009-01-12 08:46 +0000\n" "PO-Revision-Date: 2009-01-26 15:24+0100\n" "Last-Translator: Grokwik \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -40,8 +40,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Un client Subversion pour Windows" +msgid "A Git client for Windows" +msgstr "Un client Git pour Windows" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -121,8 +121,8 @@ msgstr "Public" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "Ce manuel est écrit pour les gens initiés à l'informatique qui veulent utiliser Subversion pour gérer leurs données, mais qui ne sont pas à l'aise pour utiliser le client en ligne de commande pour ce faire. Puisque TortoiseGit est une extension du shell Windows, il est sous-entendu que l'utilisateur est familiarisé avec l'explorateur Windows et sait comment l'utiliser." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "Ce manuel est écrit pour les gens initiés à l'informatique qui veulent utiliser Git pour gérer leurs données, mais qui ne sont pas à l'aise pour utiliser le client en ligne de commande pour ce faire. Puisque TortoiseGit est une extension du shell Windows, il est sous-entendu que l'utilisateur est familiarisé avec l'explorateur Windows et sait comment l'utiliser." #. (title) #: ../source/TortoiseGit_en.xml:84 @@ -141,18 +141,18 @@ msgstr "Cette explique ce qu'est TortoiseG #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." -msgstr "Dans nous donnons une courte introduction au système de contrôle de révision Subversion qui est à la base de TortoiseGit. C'est emprunté à la documentation du projet Subversion et cela explique les différentes approches au contrôle de version et comment Subversion fonctionne." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." +msgstr "Dans nous donnons une courte introduction au système de contrôle de révision Git qui est à la base de TortoiseGit. C'est emprunté à la documentation du projet Git et cela explique les différentes approches au contrôle de version et comment Git fonctionne." #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." -msgstr "Même la plupart des utilisateurs de Subversion n'auront jamais à configurer un serveur eux-mêmes. Le chapitre suivant traite comment mettre en place un tel serveur et est utile pour des administrateurs." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgstr "Même la plupart des utilisateurs de Git n'auront jamais à configurer un serveur eux-mêmes. Le chapitre suivant traite comment mettre en place un tel serveur et est utile pour des administrateurs." #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr "Le chapitre explique comment mettre en place un référentiel local, ce qui est utile pour tester Subversion et TortoiseGit en utilisant un seul ordinateur. Il explique aussi un peu l'administration d'un référentiel qui est similaire pour les référentiels hébergés sur un serveur." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr "Le chapitre explique comment mettre en place un référentiel local, ce qui est utile pour tester Git et TortoiseGit en utilisant un seul ordinateur. Il explique aussi un peu l'administration d'un référentiel qui est similaire pour les référentiels hébergés sur un serveur." #. (para) #: ../source/TortoiseGit_en.xml:113 @@ -176,8 +176,8 @@ msgstr "La section montre comment les boîte #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." -msgstr "La fait le lien entre les commandes de TortoiseGit et leurs équivalents en ligne de commande du client Subversion svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." +msgstr "La fait le lien entre les commandes de TortoiseGit et leurs équivalents en ligne de commande du client Git svn.exe." #. (title) #: ../source/TortoiseGit_en.xml:144 @@ -202,8 +202,8 @@ msgstr "Communauté" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "TortoiseGit et Subversion sont tout deux développés par une communauté de personnes qui travaillent sur ces projets. Elles viennent de pays différents dans le monde entier et se sont rassemblées pour créer de merveilleux programmes." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "TortoiseGit et Git sont tout deux développés par une communauté de personnes qui travaillent sur ces projets. Elles viennent de pays différents dans le monde entier et se sont rassemblées pour créer de merveilleux programmes." #. (title) #: ../source/TortoiseGit_en.xml:180 @@ -252,13 +252,13 @@ msgstr "pour aider à documenter et chasser les bugs" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "Le manuel de Subversion" +msgid "The Git Book" +msgstr "Le manuel de Git" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "pour l'introduction grandiose à Subversion et son chapitre 2 que nous avons copié ici" +msgid "for the great introduction to Git and its chapter 2 which we copied here" +msgstr "pour l'introduction grandiose à Git et son chapitre 2 que nous avons copié ici" #. (term) #: ../source/TortoiseGit_en.xml:225 @@ -371,13 +371,13 @@ msgstr "Qu'est-ce que TortoiseGit ?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." -msgstr "TortoiseGit est un client open-source gratuit pour le système de contrôle de version Subversion. C'est-à-dire TortoiseGit gère des fichiers et des répertoires à travers le temps. Les fichiers sont stockés dans un référentiel central. Le référentiel ressemble beaucoup à un serveur de fichiers ordinaire, sauf qu'il se rappelle chaque changement jamais fait à vos fichiers et répertoires. Cela vous permet de récupérer les versions précédentes de vos fichiers et examiner l'historique de comment et quand vos données ont changé. C'est pourquoi beaucoup de personnes pensent que Subversion et les systèmes de contrôle de version en général sont une sorte de machine à remonter le temps." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." +msgstr "TortoiseGit est un client open-source gratuit pour le système de contrôle de version Git. C'est-à-dire TortoiseGit gère des fichiers et des répertoires à travers le temps. Les fichiers sont stockés dans un référentiel central. Le référentiel ressemble beaucoup à un serveur de fichiers ordinaire, sauf qu'il se rappelle chaque changement jamais fait à vos fichiers et répertoires. Cela vous permet de récupérer les versions précédentes de vos fichiers et examiner l'historique de comment et quand vos données ont changé. C'est pourquoi beaucoup de personnes pensent que Git et les systèmes de contrôle de version en général sont une sorte de machine à remonter le temps." #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." -msgstr "Quelques systèmes de contrôle de version sont aussi des systèmes de gestion de configuration logicielle (GCL). Ces systèmes sont spécifiquement conçus pour gérer des arborescences de code source et ont beaucoup de fonctionnalités spécifiques au développement de logiciel - comme la compréhension de langages de programmation en natif, ou des outils d'approvisionnement pour construire le logiciel. Subversion, cependant, n'est pas un de ces systèmes ; c'est un système général qui peut être utilisé pour gérer n'importe quelle collection de fichiers, y compris du code source." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgstr "Quelques systèmes de contrôle de version sont aussi des systèmes de gestion de configuration logicielle (GCL). Ces systèmes sont spécifiquement conçus pour gérer des arborescences de code source et ont beaucoup de fonctionnalités spécifiques au développement de logiciel - comme la compréhension de langages de programmation en natif, ou des outils d'approvisionnement pour construire le logiciel. Git, cependant, n'est pas un de ces systèmes ; c'est un système général qui peut être utilisé pour gérer n'importe quelle collection de fichiers, y compris du code source." #. (title) #: ../source/TortoiseGit_en.xml:368 @@ -386,18 +386,18 @@ msgstr "L'historique de TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "En 2002, Tim Kemp a constaté que Subversion était un très bon système de contrôle de version, mais il lui manquait un bon client avec une interface graphique. L'idée d'un client Subversion comme une intégration du shell de Windows a été inspirée par le client semblable pour CVS nommé TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "En 2002, Tim Kemp a constaté que Git était un très bon système de contrôle de version, mais il lui manquait un bon client avec une interface graphique. L'idée d'un client Git comme une intégration du shell de Windows a été inspirée par le client semblable pour CVS nommé TortoiseCVS." #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Tim a étudié le code source de TortoiseCVS et l'a utilisé comme base pour TortoiseGit. Il a alors commencé le projet, a enregistré le domaine TortoiseGit.org et a mis le code source en ligne. Pendant ce temps, Stefan Küng cherchait un bon système de contrôle de version gratuit et a trouvé Subversion et le source de TortoiseGit. Puisque TortoiseGit n'était toujours pas prêt à l'emploi il a alors rejoint le projet et a commencé à programmer. Bientôt il a réécrit la plupart du code existant et a commencé à ajouter des commandes et des fonctionnalités, jusqu'au point où rien n'est resté du code original." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Tim a étudié le code source de TortoiseCVS et l'a utilisé comme base pour TortoiseGit. Il a alors commencé le projet, a enregistré le domaine TortoiseGit.org et a mis le code source en ligne. Pendant ce temps, Stefan Küng cherchait un bon système de contrôle de version gratuit et a trouvé Git et le source de TortoiseGit. Puisque TortoiseGit n'était toujours pas prêt à l'emploi il a alors rejoint le projet et a commencé à programmer. Bientôt il a réécrit la plupart du code existant et a commencé à ajouter des commandes et des fonctionnalités, jusqu'au point où rien n'est resté du code original." #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." -msgstr "Comme Subversion est devenu plus stable, il a attiré de plus en plus d'utilisateurs qui ont aussi commencé à utiliser TortoiseGit comme leur client Subversion. La base utilisateur a grandi rapidement (et grandit toujours chaque jour). C'est à ce moment que Lübbe Onken s'est proposé d'aider avec des icônes agréables et un logo pour TortoiseGit. Et il s'occupe du site Web et gère la traduction." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgstr "Comme Git est devenu plus stable, il a attiré de plus en plus d'utilisateurs qui ont aussi commencé à utiliser TortoiseGit comme leur client Git. La base utilisateur a grandi rapidement (et grandit toujours chaque jour). C'est à ce moment que Lübbe Onken s'est proposé d'aider avec des icônes agréables et un logo pour TortoiseGit. Et il s'occupe du site Web et gère la traduction." #. (title) #: ../source/TortoiseGit_en.xml:399 @@ -406,8 +406,8 @@ msgstr "Les fonctionnalités de TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." -msgstr "Qu'est-ce qui fait de TortoiseGit un si bon client Subversion ? Voici une courte liste des fonctionnalités." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." +msgstr "Qu'est-ce qui fait de TortoiseGit un si bon client Git ? Voici une courte liste des fonctionnalités." #. (term) #: ../source/TortoiseGit_en.xml:406 @@ -446,18 +446,18 @@ msgstr "Le statut de chaque fichier et de chaque répertoire versionnés est ind #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Accès facile aux commandes de Subversion" +msgid "Easy access to Git commands" +msgstr "Accès facile aux commandes de Git" #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." -msgstr "Toutes les commandes de Subversion sont disponibles à partir du menu contextuel de l'explorateur. TortoiseGit y ajoute son propre sous-menu." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgstr "Toutes les commandes de Git sont disponibles à partir du menu contextuel de l'explorateur. TortoiseGit y ajoute son propre sous-menu." #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "Puisque TortoiseGit est un client Subversion, nous voudrions aussi vous montrer certaines des fonctionnalités de Subversion :" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" +msgstr "Puisque TortoiseGit est un client Git, nous voudrions aussi vous montrer certaines des fonctionnalités de Git :" #. (term) #: ../source/TortoiseGit_en.xml:460 @@ -466,8 +466,8 @@ msgstr "Répertoires versionnés" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS suit seulement à la trace l'histoire de fichiers individuels, mais Subversion met en oeuvre un système de fichiers virtuel versionné qui suit à la trace les changements sur des arborescences entières à travers le temps. Les fichiers et les répertoires sont versionnés. En conséquence, il y a du coté client de vraies commandes déplacer et copier qui fonctionnent sur les fichiers et les répertoires." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS suit seulement à la trace l'histoire de fichiers individuels, mais Git met en oeuvre un système de fichiers virtuel versionné qui suit à la trace les changements sur des arborescences entières à travers le temps. Les fichiers et les répertoires sont versionnés. En conséquence, il y a du coté client de vraies commandes déplacer et copier qui fonctionnent sur les fichiers et les répertoires." #. (term) #: ../source/TortoiseGit_en.xml:475 @@ -496,8 +496,8 @@ msgstr "Choix de couches réseau" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "Subversion a une notion abstraite de l'accès au référentiel, le rendant facile à mettre en oeuvre à travers de nouveaux mécanismes de réseau. Le serveur réseau avancé de Subversion est un module pour le serveur Web Apache, qui utilise une variante de HTTP appelée WebDAV/DeltaV. Cela donne un grand avantage à Subversion en stabilité et en interopérabilité et fournit des différentes fonctionnalités clés gratuitement : authentification, autorisation, compression de fil et navigation de référentiel, par exemple. Un processus de serveur Subversion plus petit, autonome est aussi disponible. Ce serveur utilise un protocole personnalisé qui peut être facilement tunnelé par ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "Git a une notion abstraite de l'accès au référentiel, le rendant facile à mettre en oeuvre à travers de nouveaux mécanismes de réseau. Le serveur réseau avancé de Git est un module pour le serveur Web Apache, qui utilise une variante de HTTP appelée WebDAV/DeltaV. Cela donne un grand avantage à Git en stabilité et en interopérabilité et fournit des différentes fonctionnalités clés gratuitement : authentification, autorisation, compression de fil et navigation de référentiel, par exemple. Un processus de serveur Git plus petit, autonome est aussi disponible. Ce serveur utilise un protocole personnalisé qui peut être facilement tunnelé par ssh." #. (term) #: ../source/TortoiseGit_en.xml:516 @@ -506,8 +506,8 @@ msgstr "Gestion cohérente des données" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." -msgstr "Subversion exprime les différences de fichier en utilisant un algorithme de différenciation binaire, qui travaille identiquement sur les fichiers textes (lisibles par l'homme) et les fichiers binaires (illisibles par l'homme). Les deux types de fichiers sont stockés également compressés dans le référentiel, et les différences sont transmises dans les deux directions à travers le réseau." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgstr "Git exprime les différences de fichier en utilisant un algorithme de différenciation binaire, qui travaille identiquement sur les fichiers textes (lisibles par l'homme) et les fichiers binaires (illisibles par l'homme). Les deux types de fichiers sont stockés également compressés dans le référentiel, et les différences sont transmises dans les deux directions à travers le réseau." #. (term) #: ../source/TortoiseGit_en.xml:529 @@ -516,8 +516,8 @@ msgstr "Embranchements et étiquetages efficaces" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." -msgstr "Le coût de l'embranchement et de l'étiquetage n'a pas besoin d'être proportionnel à la taille de projet. Subversion crée des branches et des étiquettes en copiant simplement le projet, en utilisant un mécanisme semblable à un lien dur. Ainsi ces opérations prennent seulement un temps très petit, constant et un espace très petit dans le référentiel." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgstr "Le coût de l'embranchement et de l'étiquetage n'a pas besoin d'être proportionnel à la taille de projet. Git crée des branches et des étiquettes en copiant simplement le projet, en utilisant un mécanisme semblable à un lien dur. Ainsi ces opérations prennent seulement un temps très petit, constant et un espace très petit dans le référentiel." #. (term) #: ../source/TortoiseGit_en.xml:542 @@ -526,8 +526,8 @@ msgstr "Hackabilité" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Subversion n'a aucun bagage historique ; il est mis en oeuvre comme une collection de bibliothèques C partagées avec des API bien définies. Cela fait que Subversion est extrêmement maintenable et utilisable par d'autres applications et d'autres langages." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." +msgstr "Git n'a aucun bagage historique ; il est mis en oeuvre comme une collection de bibliothèques C partagées avec des API bien définies. Cela fait que Git est extrêmement maintenable et utilisable par d'autres applications et d'autres langages." #. (title) #: ../source/TortoiseGit_en.xml:558 @@ -671,23 +671,23 @@ msgstr "Concepts de base" #. (primary) #: ../source/TortoiseGit_en.xml:725 -msgid "Subversion book" -msgstr "Manuel de Subversion" +msgid "Git book" +msgstr "Manuel de Git" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." -msgstr "Ce chapitre est une version légèrement modifiée du même chapitre dans le manuel de Subversion. Une version en ligne du manuel de Subversion est disponible ici : http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." +msgstr "Ce chapitre est une version légèrement modifiée du même chapitre dans le manuel de Git. Une version en ligne du manuel de Git est disponible ici : http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." -msgstr "Ce chapitre est une introduction courte, occasionnelle à Subversion. Si le contrôle de version est nouveau pour vous, ce chapitre est certainement pour vous. Nous commençons par une discussion sur les concepts généraux du contrôle de version, nous ferons notre chemin vers les idées spécifiques derrière Subversion et nous montrons quelques exemples simples de Subversion en utilisation." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." +msgstr "Ce chapitre est une introduction courte, occasionnelle à Git. Si le contrôle de version est nouveau pour vous, ce chapitre est certainement pour vous. Nous commençons par une discussion sur les concepts généraux du contrôle de version, nous ferons notre chemin vers les idées spécifiques derrière Git et nous montrons quelques exemples simples de Git en utilisation." #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." -msgstr "Bien que les exemples dans ce chapitre montrent des gens partageant des collections de code source de programme, gardez à l'esprit que Subversion peut gérer n'importe quel sorte de collection de fichier - il n'est pas limité à l'aide de programmeurs." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." +msgstr "Bien que les exemples dans ce chapitre montrent des gens partageant des collections de code source de programme, gardez à l'esprit que Git peut gérer n'importe quel sorte de collection de fichier - il n'est pas limité à l'aide de programmeurs." #. (title) #. (title) @@ -707,8 +707,8 @@ msgstr "référentiel" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." -msgstr "Subversion est un système centralisé pour partager l'information. Son coeur est un référentiel, qui est un dépôt central de données. Le référentiel stocke l'information sous forme d'une arborescence de système de fichiers - une hiérarchie typique de fichiers et de répertoires. N'importe quel nombre de clients se connecte au référentiel et ensuite lit ou écrit ces fichiers. En écrivant des données, un client rend l'information disponible aux autres ; en lisant des données, le client reçoit l'information des autres." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgstr "Git est un système centralisé pour partager l'information. Son coeur est un référentiel, qui est un dépôt central de données. Le référentiel stocke l'information sous forme d'une arborescence de système de fichiers - une hiérarchie typique de fichiers et de répertoires. N'importe quel nombre de clients se connecte au référentiel et ensuite lit ou écrit ces fichiers. En écrivant des données, un client rend l'information disponible aux autres ; en lisant des données, le client reçoit l'information des autres." #. (title) #: ../source/TortoiseGit_en.xml:767 @@ -717,8 +717,8 @@ msgstr "Un système Client/Serveur typique" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." -msgstr "Alors pourquoi est-ce si intéressant ? Jusqu'ici, cela ressemble à la définition d'un serveur de fichiers typique. Et en effet, le référentiel est une sorte de serveur de fichiers, mais il n'est pas de votre genre habituel. Ce qui rend le référentiel de Subversion spécial est qu'il se rappelle de chaque changement jamais écrit : chaque changement de chaque fichier, et même les changements de l'arborescence des répertoires elle-même, comme l'ajout, la suppression et le réarrangement des fichiers et des répertoires." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgstr "Alors pourquoi est-ce si intéressant ? Jusqu'ici, cela ressemble à la définition d'un serveur de fichiers typique. Et en effet, le référentiel est une sorte de serveur de fichiers, mais il n'est pas de votre genre habituel. Ce qui rend le référentiel de Git spécial est qu'il se rappelle de chaque changement jamais écrit : chaque changement de chaque fichier, et même les changements de l'arborescence des répertoires elle-même, comme l'ajout, la suppression et le réarrangement des fichiers et des répertoires." #. (para) #: ../source/TortoiseGit_en.xml:780 @@ -791,8 +791,8 @@ msgstr "La solution Copier-Modifier-Fusionner" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." -msgstr "Subversion, CVS et les autres systèmes de contrôle de version utilisent un modèle copier-modifier-fusionner comme une alternative au verrouillage. Dans ce modèle, le client de chaque utilisateur lit le référentiel et crée une copie de travail personnelle du fichier ou du projet. Les utilisateurs travaillent alors en parallèle, modifiant leurs copies privées. Finalement, les copies privées sont fusionnées ensemble dans une version nouvelle, finale. Le système de contrôle de version aide souvent avec la fusion, mais en fin de compte un être humain est responsable pour qu'elle se produise correctement." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgstr "Git, CVS et les autres systèmes de contrôle de version utilisent un modèle copier-modifier-fusionner comme une alternative au verrouillage. Dans ce modèle, le client de chaque utilisateur lit le référentiel et crée une copie de travail personnelle du fichier ou du projet. Les utilisateurs travaillent alors en parallèle, modifiant leurs copies privées. Finalement, les copies privées sont fusionnées ensemble dans une version nouvelle, finale. Le système de contrôle de version aide souvent avec la fusion, mais en fin de compte un être humain est responsable pour qu'elle se produise correctement." #. (para) #: ../source/TortoiseGit_en.xml:907 @@ -833,18 +833,18 @@ msgstr "Il y a une situation commune où le modèle verrouiller-modifier-déverr #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" -msgstr "Que fait Subversion ?" +msgid "What does Git Do?" +msgstr "Que fait Git ?" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." -msgstr "Subversion utilise la solution copier-modifier-fusionner par défaut et dans des nombreux cas c'est tout ce dont vous aurez jamais besoin. Cependant, à partir de la version 1.2, Subversion supporte aussi le verrouillage de fichier, si vous avez des fichiers non-fusionnables, ou si vous êtes simplement forcés à une politique de verrouillage par le management, Subversion fournira encore les fonctionnalités dont vous avez besoin." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." +msgstr "Git utilise la solution copier-modifier-fusionner par défaut et dans des nombreux cas c'est tout ce dont vous aurez jamais besoin. Cependant, à partir de la version 1.2, Git supporte aussi le verrouillage de fichier, si vous avez des fichiers non-fusionnables, ou si vous êtes simplement forcés à une politique de verrouillage par le management, Git fournira encore les fonctionnalités dont vous avez besoin." #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" -msgstr "Subversion en action" +msgid "Git in Action" +msgstr "Git en action" #. (title) #: ../source/TortoiseGit_en.xml:991 @@ -858,28 +858,28 @@ msgstr "copie de travail" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." -msgstr " Vous a déjà lu au sujet des copies de travail ; maintenant nous allons vous montrer comment le client Subversion les crée et les utilise." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." +msgstr " Vous a déjà lu au sujet des copies de travail ; maintenant nous allons vous montrer comment le client Git les crée et les utilise." #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." -msgstr "Une copie de travail de Subversion est une arborescence de répertoire ordinaire sur votre système local, contenant une collection de fichiers. Vous pouvez éditer ces fichiers comme vous le souhaitez, et si ce sont des fichiers de code source, vous pouvez compiler votre programme de la façon habituelle. Votre copie de travail est votre propre secteur de travail privé : Subversion n'incorporera jamais les changements d'autres personnes, ni ne rendra vos propres changements disponibles aux autres, jusqu'à ce que vous lui disiez explicitement de le faire." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgstr "Une copie de travail de Git est une arborescence de répertoire ordinaire sur votre système local, contenant une collection de fichiers. Vous pouvez éditer ces fichiers comme vous le souhaitez, et si ce sont des fichiers de code source, vous pouvez compiler votre programme de la façon habituelle. Votre copie de travail est votre propre secteur de travail privé : Git n'incorporera jamais les changements d'autres personnes, ni ne rendra vos propres changements disponibles aux autres, jusqu'à ce que vous lui disiez explicitement de le faire." #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." -msgstr "Après avoir fait des changements dans votre copie de travail et avoir vérifié qu'ils fonctionnent correctement, Subversion vous fournit des commandes pour publier vos changements et ainsi les rendre disponibles aux les autres personnes travaillant avec vous sur le projet. Si d'autres personnes publient leurs changements dans le référentiel, Subversion vous fournit des commandes pour fusionner ces changements dans votre répertoire de travail." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgstr "Après avoir fait des changements dans votre copie de travail et avoir vérifié qu'ils fonctionnent correctement, Git vous fournit des commandes pour publier vos changements et ainsi les rendre disponibles aux les autres personnes travaillant avec vous sur le projet. Si d'autres personnes publient leurs changements dans le référentiel, Git vous fournit des commandes pour fusionner ces changements dans votre répertoire de travail." #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." -msgstr "Une copie de travail contient aussi quelques fichiers supplémentaires, créés et entretenus par Subversion, pour l'aider à effectuer ces commandes. Particulièrement chaque répertoire dans votre copie de travail contient un sous-répertoire nommé .svn, aussi connu comme le répertoire administratif de la copie de travail. Les fichiers de chaque répertoire administratif aident Subversion à reconnaître quels fichiers contiennent des changements non publiés et quels fichiers sont périmés par rapport au travail des autres." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgstr "Une copie de travail contient aussi quelques fichiers supplémentaires, créés et entretenus par Git, pour l'aider à effectuer ces commandes. Particulièrement chaque répertoire dans votre copie de travail contient un sous-répertoire nommé .svn, aussi connu comme le répertoire administratif de la copie de travail. Les fichiers de chaque répertoire administratif aident Git à reconnaître quels fichiers contiennent des changements non publiés et quels fichiers sont périmés par rapport au travail des autres." #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." -msgstr "Un référentiel typique de Subversion contient souvent les fichiers (ou le code source) pour plusieurs projets ; d'habitude, chaque projet est un sous-répertoire dans l'arborescence du système de fichiers du référentiel. Dans cette optique, la copie de travail d'un utilisateur correspondra d'habitude à un sous-arbre particulier du référentiel." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgstr "Un référentiel typique de Git contient souvent les fichiers (ou le code source) pour plusieurs projets ; d'habitude, chaque projet est un sous-répertoire dans l'arborescence du système de fichiers du référentiel. Dans cette optique, la copie de travail d'un utilisateur correspondra d'habitude à un sous-arbre particulier du référentiel." #. (para) #: ../source/TortoiseGit_en.xml:1038 @@ -903,13 +903,13 @@ msgstr "Pour obtenir une copie de travail, vous devez extrairebutton.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." -msgstr "Supposons que vous faites des changements sur button.c. Puisque le répertoire .svn se rappelle la date de modification et le contenu original du fichier, Subversion peut dire que vous avez modifié le fichier. Cependant, Subversion ne rend pas vos changements publics jusqu'à ce que vous le lui disiez explicitement. L'acte de publier vos changements est plus communément appelé livrer (ou valider) les changements au référentiel." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgstr "Supposons que vous faites des changements sur button.c. Puisque le répertoire .svn se rappelle la date de modification et le contenu original du fichier, Git peut dire que vous avez modifié le fichier. Cependant, Git ne rend pas vos changements publics jusqu'à ce que vous le lui disiez explicitement. L'acte de publier vos changements est plus communément appelé livrer (ou valider) les changements au référentiel." #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." -msgstr "Pour publier vos changements aux autres, vous pouvez utiliser la commande de Subversion livrer." +msgid "To publish your changes to others, you can use Git's commit command." +msgstr "Pour publier vos changements aux autres, vous pouvez utiliser la commande de Git livrer." #. (para) #: ../source/TortoiseGit_en.xml:1072 @@ -918,18 +918,18 @@ msgstr "Maintenant vos changements sur button.c ont été l #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." -msgstr "Supposons que vous avez une collaboratrice, Sally, qui a extrait une copie de travail de /calc en même temps que vous. Quand vous livrez votre changement sur button.c, la copie de travail de Sally est laissée inchangée ; Subversion modifie seulement les copies de travail à la demande de l'utilisateur." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." +msgstr "Supposons que vous avez une collaboratrice, Sally, qui a extrait une copie de travail de /calc en même temps que vous. Quand vous livrez votre changement sur button.c, la copie de travail de Sally est laissée inchangée ; Git modifie seulement les copies de travail à la demande de l'utilisateur." #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." -msgstr "Pour actualiser son projet, Sally peut demander à Subversion de mettre à jour sa copie de travail, en utilisant la commande de Subversion mettre à jour. Cela incorporera vos changements dans sa copie de travail, en même temps que d'autres qui ont été livrés depuis qu'elle l'a extrait." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgstr "Pour actualiser son projet, Sally peut demander à Git de mettre à jour sa copie de travail, en utilisant la commande de Git mettre à jour. Cela incorporera vos changements dans sa copie de travail, en même temps que d'autres qui ont été livrés depuis qu'elle l'a extrait." #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." -msgstr "Notez que Sally n'a pas dû spécifier les fichiers à mettre à jour; Subversion utilise l'information dans le répertoire .svn et la nouvelle information dans le référentiel, pour décider quels fichiers doivent être actualisés." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgstr "Notez que Sally n'a pas dû spécifier les fichiers à mettre à jour; Git utilise l'information dans le répertoire .svn et la nouvelle information dans le référentiel, pour décider quels fichiers doivent être actualisés." #. (title) #: ../source/TortoiseGit_en.xml:1103 @@ -938,8 +938,8 @@ msgstr "URL de référentiel" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" -msgstr "Les référentiels de Subversion peuvent être accédés par beaucoup de méthodes différentes - sur le disque local, ou par des protocoles de réseau divers. Un emplacement de référentiel, cependant, est toujours une URL. Le schéma d'URL indique la méthode d'accès :" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgstr "Les référentiels de Git peuvent être accédés par beaucoup de méthodes différentes - sur le disque local, ou par des protocoles de réseau divers. Un emplacement de référentiel, cependant, est toujours une URL. Le schéma d'URL indique la méthode d'accès :" #. (title) #: ../source/TortoiseGit_en.xml:1112 @@ -975,8 +975,8 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "Accès via le protocole WebDAV à un serveur Apache avec Subversion." +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "Accès via le protocole WebDAV à un serveur Apache avec Git." #. (literal) #: ../source/TortoiseGit_en.xml:1141 @@ -1021,8 +1021,8 @@ msgstr "Accès TCP/IP authentifié, crypté via un protocole personnalisé à un #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." -msgstr "Pour la plupart, les URL de Subversion utilisent la syntaxe standard, autorisant la définition des noms serveur et des numéros de port dans l'URL. La méthode d'accès file:// est normalement utilisée pour les accès locaux, bien qu'elle puisse être utilisée avec des chemins UNC pour un hôte non local. L'URL prend donc la forme file://nomhote/chemin/vers/referentiel. Pour la machine locale, la partie nomhote de l'URL doit être soit absente, soit localhost. Pour cette raison, les chemins locaux apparaissent normalement avec trois slashs, file:///chemin/vers/referentiel." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgstr "Pour la plupart, les URL de Git utilisent la syntaxe standard, autorisant la définition des noms serveur et des numéros de port dans l'URL. La méthode d'accès file:// est normalement utilisée pour les accès locaux, bien qu'elle puisse être utilisée avec des chemins UNC pour un hôte non local. L'URL prend donc la forme file://nomhote/chemin/vers/referentiel. Pour la machine locale, la partie nomhote de l'URL doit être soit absente, soit localhost. Pour cette raison, les chemins locaux apparaissent normalement avec trois slashs, file:///chemin/vers/referentiel." #. (para) #: ../source/TortoiseGit_en.xml:1181 @@ -1081,8 +1081,8 @@ msgstr "Une opération svn commit peut publier les changement #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." -msgstr "Dans le référentiel, chaque livraison est traitée comme une transaction atomique : tous les changements de la livraison ont lieu, ou aucun n'a lieu. Subversion essaye de conserver cette atomicité face aux plantages du programme, pannes système, problèmes de réseau et autres actions utilisateur." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgstr "Dans le référentiel, chaque livraison est traitée comme une transaction atomique : tous les changements de la livraison ont lieu, ou aucun n'a lieu. Git essaye de conserver cette atomicité face aux plantages du programme, pannes système, problèmes de réseau et autres actions utilisateur." #. (para) #: ../source/TortoiseGit_en.xml:1238 @@ -1101,8 +1101,8 @@ msgstr "Numéros de révision globaux" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" -msgstr "À la différence de beaucoup d'autres systèmes de contrôle de version, les numéros de révision de Subversion s'appliquent à toute l'arborescence, et non à des fichiers individuels. Chaque numéro de révision sélectionne un arbre entier, un état particulier du référentiel après un certain changement livré. Une autre façon d'y penser est que cette révision N représente l'état du système de fichiers du référentiel après que la Nième livraison. Quand un utilisateur de Subversion parle de ``la révision 5 de foo.c\", il veut dire vraiment ``foo.c comme il apparaît à la révision 5.\" Remarquez qu'en général, les révisions N et M d'un fichier ne diffèrent pas nécessairement !" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgstr "À la différence de beaucoup d'autres systèmes de contrôle de version, les numéros de révision de Git s'appliquent à toute l'arborescence, et non à des fichiers individuels. Chaque numéro de révision sélectionne un arbre entier, un état particulier du référentiel après un certain changement livré. Une autre façon d'y penser est que cette révision N représente l'état du système de fichiers du référentiel après que la Nième livraison. Quand un utilisateur de Git parle de ``la révision 5 de foo.c\", il veut dire vraiment ``foo.c comme il apparaît à la révision 5.\" Remarquez qu'en général, les révisions N et M d'un fichier ne diffèrent pas nécessairement !" #. (para) #: ../source/TortoiseGit_en.xml:1276 @@ -1163,8 +1163,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." -msgstr "Les changements de Sally sur integer.c apparaîtront dans votre copie de travail et votre changement seront toujours présent dans button.c. Dans cet exemple, le texte Makefile est identique dans des révisions 4, 5 et 6, mais Subversion marquera votre copie de travail de Makefile avec la révision 6 pour indiquer qu'il est toujours d'actualité. Ainsi, après avoir fait une mise à jour propre au sommet de votre copie de travail, elle correspondra généralement exactement à une révision dans le référentiel." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgstr "Les changements de Sally sur integer.c apparaîtront dans votre copie de travail et votre changement seront toujours présent dans button.c. Dans cet exemple, le texte Makefile est identique dans des révisions 4, 5 et 6, mais Git marquera votre copie de travail de Makefile avec la révision 6 pour indiquer qu'il est toujours d'actualité. Ainsi, après avoir fait une mise à jour propre au sommet de votre copie de travail, elle correspondra généralement exactement à une révision dans le référentiel." #. (title) #: ../source/TortoiseGit_en.xml:1325 @@ -1173,8 +1173,8 @@ msgstr "Comment les copies de travail suivent le référentiel" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" -msgstr "Pour chaque fichier dans un répertoire de travail, Subversion enregistre deux informations essentielles dans le secteur administratif .svn/ :" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" +msgstr "Pour chaque fichier dans un répertoire de travail, Git enregistre deux informations essentielles dans le secteur administratif .svn/ :" #. (para) #: ../source/TortoiseGit_en.xml:1332 @@ -1188,8 +1188,8 @@ msgstr "un enregistrement d'horodatage quand la copie locale a été mise à jou #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" -msgstr "Avec ces informations, en parlant au référentiel, Subversion peut dire dans lequel des quatre états suivants se trouve un fichier de travail :" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" +msgstr "Avec ces informations, en parlant au référentiel, Git peut dire dans lequel des quatre états suivants se trouve un fichier de travail :" #. (term) #: ../source/TortoiseGit_en.xml:1352 @@ -1228,8 +1228,8 @@ msgstr "Changé localement et périmé" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." -msgstr "Le fichier a été modifié dans le répertoire de travail, et dans le référentiel. Une livraison du fichier échouera avec une erreur périmé. Le fichier devrait d'abord être mis à jour ; la commande mise à jour essayera de fusionner les deux versions. Si Subversion réussit pas à faire correctement la fusion, il laisse l'utilisateur résoudre le conflit." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgstr "Le fichier a été modifié dans le répertoire de travail, et dans le référentiel. Une livraison du fichier échouera avec une erreur périmé. Le fichier devrait d'abord être mis à jour ; la commande mise à jour essayera de fusionner les deux versions. Si Git réussit pas à faire correctement la fusion, il laisse l'utilisateur résoudre le conflit." #. (title) #: ../source/TortoiseGit_en.xml:1412 @@ -1238,8 +1238,8 @@ msgstr "Résumé" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "Nous avons couvert un certain nombre de concepts fondamentaux de Subversion dans ce chapitre :" +msgid "We've covered a number of fundamental Git concepts in this chapter:" +msgstr "Nous avons couvert un certain nombre de concepts fondamentaux de Git dans ce chapitre :" #. (para) #: ../source/TortoiseGit_en.xml:1419 @@ -1248,13 +1248,13 @@ msgstr "Nous avons présenté les notions du référentiel central, la copie de #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." -msgstr "Nous avons vu quelques exemples simples comment deux collaborateurs peuvent utiliser Subversion pour publier et recevoir des changements l'un de l'autre, en utilisant le modèle \"copier-modifier-fusionner\"." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgstr "Nous avons vu quelques exemples simples comment deux collaborateurs peuvent utiliser Git pour publier et recevoir des changements l'un de l'autre, en utilisant le modèle \"copier-modifier-fusionner\"." #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." -msgstr "Nous avons un peu parlé de la façon dont Subversion suit à la trace et gère l'information dans une copie de travail." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." +msgstr "Nous avons un peu parlé de la façon dont Git suit à la trace et gère l'information dans une copie de travail." #. (title) #: ../source/TortoiseGit_en.xml:1445 @@ -1263,13 +1263,13 @@ msgstr "Mettre en place un serveur" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." -msgstr "Pour utiliser TortoiseGit (ou un autre client Subversion), vous avez besoin d'un hébergement pour vos référentiels. Vous pouvez soit les stocker localement et y accéder en utilisant le protocole file:// soit les placer sur un serveur et y accéder avec le protocole http:// ou svn://. Ces deux protocoles serveur peuvent aussi être cryptés. Vous utiliserez alors https:// ou svn+ssh://. Ce chapitre vous montre pas à pas comment mettre en place un tel serveur sur une machine Windows." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgstr "Pour utiliser TortoiseGit (ou un autre client Git), vous avez besoin d'un hébergement pour vos référentiels. Vous pouvez soit les stocker localement et y accéder en utilisant le protocole file:// soit les placer sur un serveur et y accéder avec le protocole http:// ou svn://. Ces deux protocoles serveur peuvent aussi être cryptés. Vous utiliserez alors https:// ou svn+ssh://. Ce chapitre vous montre pas à pas comment mettre en place un tel serveur sur une machine Windows." #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." -msgstr "Plus d'informations sur les options du serveur Subversion et la manière de choisir la meilleure architecture pour votre utilisation peuvent être trouvées dans le manuel Subversion à la section Configuration du Serveur." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." +msgstr "Plus d'informations sur les options du serveur Git et la manière de choisir la meilleure architecture pour votre utilisation peuvent être trouvées dans le manuel Git à la section Configuration du Serveur." #. (para) #: ../source/TortoiseGit_en.xml:1466 @@ -1293,8 +1293,8 @@ msgstr "Apache" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" -msgstr "La plus flexible de toutes les installations serveur possibles pour Subversion est basée sur Apache. Bien qu'un peu plus compliquée à mettre en place, elle offre des avantages que d'autres serveurs n'ont pas :" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgstr "La plus flexible de toutes les installations serveur possibles pour Git est basée sur Apache. Bien qu'un peu plus compliquée à mettre en place, elle offre des avantages que d'autres serveurs n'ont pas :" #. (primary) #. (term) @@ -1305,8 +1305,8 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." -msgstr "You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system.Le serveur Subversion basé sur Apache utilise le protocole WebDAV qui est aussi supporté par beaucoup d'autres programmes. Vous pourriez par exemple monter un tel référentiel comme un Répertoire Web dans l'explorateur Windows et y accéder ensuite comme n'importe quel autre dossier." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgstr "You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system.Le serveur Git basé sur Apache utilise le protocole WebDAV qui est aussi supporté par beaucoup d'autres programmes. Vous pourriez par exemple monter un tel référentiel comme un Répertoire Web dans l'explorateur Windows et y accéder ensuite comme n'importe quel autre dossier." #. (term) #: ../source/TortoiseGit_en.xml:1509 @@ -1315,8 +1315,8 @@ msgstr "Parcourir le référentiel" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." -msgstr "Vous pouvez diriger votre navigateur à l'URL de votre référentiel et naviguer dans son contenu sans avoir de client Subversion installé. Cela donne accès à vos données à un cercle beaucoup plus large d'utilisateurs." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." +msgstr "Vous pouvez diriger votre navigateur à l'URL de votre référentiel et naviguer dans son contenu sans avoir de client Git installé. Cela donne accès à vos données à un cercle beaucoup plus large d'utilisateurs." #. (term) #. (title) @@ -1397,18 +1397,18 @@ msgstr "La première chose dont vous avez besoin avant d'installer Apache est d' #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Installer Subversion" +msgid "Installing Git" +msgstr "Installer Git" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Téléchargez la dernière version des fichiers binaires Win32 de Subversion pour Apache. Soyez sûr de prendre la version correspondant à la version d'Apache que vous avez installé, dans le cas contraire vous aurez un message imcompréhensible quand vous redémarrerez. Si votre version d'Apache est la 2.2.x allez à cette adresse : http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Téléchargez la dernière version des fichiers binaires Win32 de Git pour Apache. Soyez sûr de prendre la version correspondant à la version d'Apache que vous avez installé, dans le cas contraire vous aurez un message imcompréhensible quand vous redémarrerez. Si votre version d'Apache est la 2.2.x allez à cette adresse : http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." -msgstr "Exécutez l'installeur de Subversion et suivez les instructions. Si l'installeur de Subversion a reconnu que vous avez installé Apache, donc vous êtes presque au bout. S'il n'a pas pu trouver un serveur Apache alors vous devez faire quelques étapes complémentaires." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgstr "Exécutez l'installeur de Git et suivez les instructions. Si l'installeur de Git a reconnu que vous avez installé Apache, donc vous êtes presque au bout. S'il n'a pas pu trouver un serveur Apache alors vous devez faire quelques étapes complémentaires." #. (primary) #. (primary) @@ -1419,13 +1419,13 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "En utilisant l'explorateur Windows, allez au répertoire d'installation de Subversion (d'habitude c:\\program files\\Subversion) et trouvez les fichiers /httpd/mod_dav_svn.so et mod_authz_svn.so. Copiez ces fichiers au répertoire de modules Apache (d'habitude c:\\program files\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "En utilisant l'explorateur Windows, allez au répertoire d'installation de Git (d'habitude c:\\program files\\Git) et trouvez les fichiers /httpd/mod_dav_svn.so et mod_authz_svn.so. Copiez ces fichiers au répertoire de modules Apache (d'habitude c:\\program files\\apache group\\apache2\\modules )." #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." -msgstr "Copiez les fichiers /bin/libdb*.dll et /bin/intl3_svn.dll du répertoire d'installation de Subversion au répertoire bin d'Apache." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." +msgstr "Copiez les fichiers /bin/libdb*.dll et /bin/intl3_svn.dll du répertoire d'installation de Git au répertoire bin d'Apache." #. (para) #: ../source/TortoiseGit_en.xml:1677 @@ -1468,12 +1468,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "À la fin du fichier de configuration, ajoutez les lignes suivantes : \n" "<Location /svn>\n" @@ -1482,12 +1482,12 @@ msgstr "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" Elle correspondent à une configuration d'Apache pour prendre en compte des référentiels Subversion situés physiquement dans le répertoire D:\\SVN. Les référentiels sont disponibles pour le monde extérieur à partir de l'URL : http://MonServeur/svn/ . L'accès est limité aux utilisateurs/mots de passe listés dans le fichier passwd." +" Elle correspondent à une configuration d'Apache pour prendre en compte des référentiels Git situés physiquement dans le répertoire D:\\SVN. Les référentiels sont disponibles pour le monde extérieur à partir de l'URL : http://MonServeur/svn/ . L'accès est limité aux utilisateurs/mots de passe listés dans le fichier passwd." #. (para) #: ../source/TortoiseGit_en.xml:1740 @@ -1511,13 +1511,13 @@ msgstr "Redémarrer le service Apache une nouvelle fois." #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "Allez avec votre navigateur sur http://MonServeur/svn/MonNouveauRéférentiel (où MonNouveauRéférentiel est le nom du référentiel Subversion que vous avez créé auparavant). Si tout s'est bien passé, un nom d'utilisateur et un mot de passe vous seront demandés, puis vous pouvez voir le contenu de votre référentiel." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "Allez avec votre navigateur sur http://MonServeur/svn/MonNouveauRéférentiel (où MonNouveauRéférentiel est le nom du référentiel Git que vous avez créé auparavant). Si tout s'est bien passé, un nom d'utilisateur et un mot de passe vous seront demandés, puis vous pouvez voir le contenu de votre référentiel." #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "Vous avez maintenant mis en place Apache et Subversion, mais Apache ne sait pas encore comment gérer les clients Subversion comme TortoiseGit. Pour qu'Apache sache quelle URL sera utilisée pour les référentiels Subversion vous devez éditer le fichier de configuration d'Apache (d'habitude placé dans c:\\program files\\apache group\\apache2\\conf\\httpd.conf) avec votre éditeur de texte préféré (par exemple le Bloc-notes) : " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "Vous avez maintenant mis en place Apache et Git, mais Apache ne sait pas encore comment gérer les clients Git comme TortoiseGit. Pour qu'Apache sache quelle URL sera utilisée pour les référentiels Git vous devez éditer le fichier de configuration d'Apache (d'habitude placé dans c:\\program files\\apache group\\apache2\\conf\\httpd.conf) avec votre éditeur de texte préféré (par exemple le Bloc-notes) : " #. (primary) #: ../source/TortoiseGit_en.xml:1777 @@ -1555,18 +1555,18 @@ msgstr "http://MonServeur/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " -msgstr "veut dire que les référentiels Subversion sont disponibles à partir de l'URL " +msgid "means that the Git repositories are available from the URL " +msgstr "veut dire que les référentiels Git sont disponibles à partir de l'URL " #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "indique à Apache quel module sera responsable pour servir cette URL - dans ce cas le module de Subversion." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." +msgstr "indique à Apache quel module sera responsable pour servir cette URL - dans ce cas le module de Git." #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." -msgstr "Pour la version 1.3 de Subversion et supérieure, cette directive permet de lister tous les référentiels disponibles sous ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." +msgstr "Pour la version 1.3 de Git et supérieure, cette directive permet de lister tous les référentiels disponibles sous ." #. (filename) #: ../source/TortoiseGit_en.xml:1822 @@ -1575,8 +1575,8 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " -msgstr "indique à Subversion de chercher des référentiel sous " +msgid "tells Git to look for repositories below " +msgstr "indique à Git de chercher des référentiel sous " #. (entry) #: ../source/TortoiseGit_en.xml:1827 @@ -1600,8 +1600,8 @@ msgstr "spécifie quel fichier de mots de passe est utilisé pour l'authentifica #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "Emplacement du fichier d'accès pour les chemins à l'intérieur d'un référentiel Subversion" +msgid "Location of the Access file for paths inside a Git repository" +msgstr "Emplacement du fichier d'accès pour les chemins à l'intérieur d'un référentiel Git" #. (entry) #: ../source/TortoiseGit_en.xml:1861 @@ -1632,11 +1632,11 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "Utiliser un fichier passwd limite et autorise l'accès à tous vos référentiels comme une unité. Si vous voulez plus de contrôle sur les utilisateurs par dossier à l'intérieur d'un référentiel vous pouvez décommenter la ligne \n" "#AuthzSVNAccessFile svnaccessfile\n" -" et créer un fichier d'accès de Subversion. Apache s'assurera que seuls les utilisateurs valides sont capables d'avoir accès votre emplacement /svn et passera alors le nom d'utilisateur au module AuthzSVNAccessFile de Subversion pour qu'il puisse mettre en application un accès plus granulaire basé sur les règles inscrites dans le fichier d'accès de Subversion. Notez que les chemins sont spécifiés comme référentiel:chemin ou simplement chemin. Si vous ne spécifiez pas de référentiel particulier, cette règle d'accès s'appliquera à tous les référentiels sous SVNParentPath. Le format du fichier de stratégie d'autorisation utilisé par mod_authz_svn est décrit dans " +" et créer un fichier d'accès de Git. Apache s'assurera que seuls les utilisateurs valides sont capables d'avoir accès votre emplacement /svn et passera alors le nom d'utilisateur au module AuthzSVNAccessFile de Git pour qu'il puisse mettre en application un accès plus granulaire basé sur les règles inscrites dans le fichier d'accès de Git. Notez que les chemins sont spécifiés comme référentiel:chemin ou simplement chemin. Si vous ne spécifiez pas de référentiel particulier, cette règle d'accès s'appliquera à tous les référentiels sous SVNParentPath. Le format du fichier de stratégie d'autorisation utilisé par mod_authz_svn est décrit dans " #. (para) #: ../source/TortoiseGit_en.xml:1915 @@ -1677,13 +1677,13 @@ msgstr "Index des projets" #. (para) #: ../source/TortoiseGit_en.xml:1955 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." -msgstr "Si vous avez utilisé la directive SVNParentPath alors vous n'avez pas à changer le fichier de configuration d'Apache chaque fois que vous ajoutez un nouveau référentiel Subversion. Créez simplement le nouveau référentiel au même emplacement que le premier référentiel et vous avez fini ! Dans ma société, j'ai un accès direct à ce dossier spécifique sur le serveur via SMB (accès Windows normal aux fichiers). Donc je crée juste un nouveau dossier là, j'exécute la commande de TortoiseGit TortoiseGitCréer un référentiel ici... et un nouveau projet a un foyer..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgstr "Si vous avez utilisé la directive SVNParentPath alors vous n'avez pas à changer le fichier de configuration d'Apache chaque fois que vous ajoutez un nouveau référentiel Git. Créez simplement le nouveau référentiel au même emplacement que le premier référentiel et vous avez fini ! Dans ma société, j'ai un accès direct à ce dossier spécifique sur le serveur via SMB (accès Windows normal aux fichiers). Donc je crée juste un nouveau dossier là, j'exécute la commande de TortoiseGit TortoiseGitCréer un référentiel ici... et un nouveau projet a un foyer..." #. (para) #: ../source/TortoiseGit_en.xml:1969 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." -msgstr "Si vous utilisez Subversion 1.3 ou supérieur, vous pouvez utiliser la directive SVNListParentPath on pour permettre à Apache de produire une liste de tous les projets disponibles si vous allez avec votre navigateur sur le chemin parent plutôt qu'à un référentiel spécifique." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgstr "Si vous utilisez Git 1.3 ou supérieur, vous pouvez utiliser la directive SVNListParentPath on pour permettre à Apache de produire une liste de tous les projets disponibles si vous allez avec votre navigateur sur le chemin parent plutôt qu'à un référentiel spécifique." #. (title) #: ../source/TortoiseGit_en.xml:1977 @@ -1697,8 +1697,8 @@ msgstr "Autorisation" #. (para) #: ../source/TortoiseGit_en.xml:1984 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." -msgstr "Le module mod_authz_svn permet un contrôle précis des autorisations d'accès basé sur les noms des utilisateurs et les chemins de référentiel. C'est possible avec le serveur Apache et, à partir de Subversion 1.3, c'est aussi disponible avec svnserve." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." +msgstr "Le module mod_authz_svn permet un contrôle précis des autorisations d'accès basé sur les noms des utilisateurs et les chemins de référentiel. C'est possible avec le serveur Apache et, à partir de Git 1.3, c'est aussi disponible avec svnserve." #. (para) #: ../source/TortoiseGit_en.xml:1990 @@ -1836,7 +1836,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1850,7 +1850,7 @@ msgid "" "SSPIOfferBasic On\n" " within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" -"Pour faire que les emplacements de Subversion utilisent ce type d'authentification, vous devez changer la ligne \n" +"Pour faire que les emplacements de Git utilisent ce type d'authentification, vous devez changer la ligne \n" "AuthType Basic\n" " en \n" "AuthType SSPI\n" @@ -1883,8 +1883,8 @@ msgstr "Pour activer SSL sur votre serveur, voir le chapitre : AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." -msgstr "Les fichiers AuthzSVNAccessFile de Subversion sont sensibles à la casse en ce qui concerne les noms d'utilisateur (\"JUtilisateur\" diffère \"jutilisateur\")." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgstr "Les fichiers AuthzSVNAccessFile de Git sont sensibles à la casse en ce qui concerne les noms d'utilisateur (\"JUtilisateur\" diffère \"jutilisateur\")." #. (para) #: ../source/TortoiseGit_en.xml:2145 @@ -1893,8 +1893,8 @@ msgstr "Dans le monde de Microsoft, les domaines Windows et les mots de passe ne #. (para) #: ../source/TortoiseGit_en.xml:2150 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." -msgstr "Cette différence peut vous mordre quand vous utilisez l'authentification SSPI lorsque le domaine Windows et les noms d'utilisateur sont passés à Subversion comme lorsque l'utilisateur les tape à l'invite. Internet Explorer passe souvent le nom de l'utilisateur à Apache en utilisant automatiquement la casse avec laquelle le compte a été créé." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgstr "Cette différence peut vous mordre quand vous utilisez l'authentification SSPI lorsque le domaine Windows et les noms d'utilisateur sont passés à Git comme lorsque l'utilisateur les tape à l'invite. Internet Explorer passe souvent le nom de l'utilisateur à Apache en utilisant automatiquement la casse avec laquelle le compte a été créé." #. (para) #: ../source/TortoiseGit_en.xml:2158 @@ -1903,8 +1903,8 @@ msgstr "Le résultat final est que vous pouvez avoir besoin d'au moins deux entr #. (para) #: ../source/TortoiseGit_en.xml:2166 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." -msgstr "Les journaux d'Erreurs et d'Accès d'Apache sont vos meilleurs amis dans le déchiffrement de problèmes comme ceux-ci puisqu'ils vous aideront à déterminer la chaîne du nom d'utilisateur passée par le module AuthzSVNAccessFile de Subversion. Vous pouvez avoir besoin d'expérimenter avec le format exact de la chaîne de l'utilisateur dans le svnaccessfile (par exemple DOMAINE\\utilisateur contre DOMAINE//utilisateur) pour que tout fonctionne." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgstr "Les journaux d'Erreurs et d'Accès d'Apache sont vos meilleurs amis dans le déchiffrement de problèmes comme ceux-ci puisqu'ils vous aideront à déterminer la chaîne du nom d'utilisateur passée par le module AuthzSVNAccessFile de Git. Vous pouvez avoir besoin d'expérimenter avec le format exact de la chaîne de l'utilisateur dans le svnaccessfile (par exemple DOMAINE\\utilisateur contre DOMAINE//utilisateur) pour que tout fonctionne." #. (title) #: ../source/TortoiseGit_en.xml:2180 @@ -1918,8 +1918,8 @@ msgstr "Plusieurs authentifications" #. (para) #: ../source/TortoiseGit_en.xml:2184 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." -msgstr "Il est aussi possible d'avoir plus d'une source d'authentification pour votre référentiel Subversion. Pour ce faire, vous devez rendre chaque type d'authentification non définitive, pour qu'Apache vérifie plusieurs sources pour la correspondance nom utilisateur/mot de passe." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgstr "Il est aussi possible d'avoir plus d'une source d'authentification pour votre référentiel Git. Pour ce faire, vous devez rendre chaque type d'authentification non définitive, pour qu'Apache vérifie plusieurs sources pour la correspondance nom utilisateur/mot de passe." #. (para) #: ../source/TortoiseGit_en.xml:2190 @@ -1948,7 +1948,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1973,7 +1973,7 @@ msgstr "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2100,13 +2100,13 @@ msgstr "SSL et Internet Explorer" #. (para) #: ../source/TortoiseGit_en.xml:2339 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." -msgstr "Si vous sécurisez votre serveur avec SSL et utilisez l'authentification avec un domaine Windows vous vous apercevrez que la navigation dans le référentiel avec Internet Explorer ne marche plus. Ne vous inquiétez pas - c'est seulement qu'Internet Explorer n'est pas capable d'authentifier. Les autres navigateurs n'ont pas ce problème et TortoiseGit et les autres clients Subversion sont toujours capable d'authentifier." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." +msgstr "Si vous sécurisez votre serveur avec SSL et utilisez l'authentification avec un domaine Windows vous vous apercevrez que la navigation dans le référentiel avec Internet Explorer ne marche plus. Ne vous inquiétez pas - c'est seulement qu'Internet Explorer n'est pas capable d'authentifier. Les autres navigateurs n'ont pas ce problème et TortoiseGit et les autres clients Git sont toujours capable d'authentifier." #. (para) #: ../source/TortoiseGit_en.xml:2353 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." -msgstr "définissez une directive <Location /path> dans le fichier de configuration d'Apache et ajoutez SSPIBasicPreferred On. Cela permettra à IE d'authentifier à nouveau, mais les autres navigateurs et Subversion ne seront pas capables d'authentifier pour cet emplacement." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." +msgstr "définissez une directive <Location /path> dans le fichier de configuration d'Apache et ajoutez SSPIBasicPreferred On. Cela permettra à IE d'authentifier à nouveau, mais les autres navigateurs et Git ne seront pas capables d'authentifier pour cet emplacement." #. (para) #: ../source/TortoiseGit_en.xml:2363 @@ -2140,8 +2140,8 @@ msgstr "Forcer l'accès SSL" #. (para) #: ../source/TortoiseGit_en.xml:2395 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." -msgstr "Une fois que vous avez mis en place SSL pour rendre votre référentiel plus sécurisé, vous pourriez vouloir désactiver l'accès normal non-SSL (http) et permettre seulement l'accès https. Pour ce faire, vous devez ajouter une autre directive au bloc <Location> de Subversion : SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." +msgstr "Une fois que vous avez mis en place SSL pour rendre votre référentiel plus sécurisé, vous pourriez vouloir désactiver l'accès normal non-SSL (http) et permettre seulement l'accès https. Pour ce faire, vous devez ajouter une autre directive au bloc <Location> de Git : SSLRequireSSL." #. (para) #: ../source/TortoiseGit_en.xml:2402 @@ -2152,7 +2152,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2165,7 +2165,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2184,8 +2184,8 @@ msgstr "Envoyé à la liste de diffusion TortoiseGit par Nigel Green. Merci !" #. (para) #: ../source/TortoiseGit_en.xml:2424 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." -msgstr "Avec certaines configurations de serveur, vous pouvez avoir à mettre en place un seul serveur avec 2 hôtes SSL virtuels: Le premier pour les accès internet publics, ne nécessitant aucun certificat côté client. Et un second, sécurisé avec certificat côté client, où tourne le serveur Subversion." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." +msgstr "Avec certaines configurations de serveur, vous pouvez avoir à mettre en place un seul serveur avec 2 hôtes SSL virtuels: Le premier pour les accès internet publics, ne nécessitant aucun certificat côté client. Et un second, sécurisé avec certificat côté client, où tourne le serveur Git." #. (para) #: ../source/TortoiseGit_en.xml:2430 @@ -2195,11 +2195,11 @@ msgstr "Dans le fichier de configuration de Apache, ajouter une directive \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" -"La solution est d'ajouter la directive suivante dans le répertoire du virtual host que vous voulez réserver à Subversion: \n" +"La solution est d'ajouter la directive suivante dans le répertoire du virtual host que vous voulez réserver à Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " Cette directive autorise l'accès au répertoire seulement si le certificat du client a été reçu et validé." @@ -2217,10 +2217,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2242,10 +2242,10 @@ msgstr "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Configuration du virtual host pour SUBVERSION \n" +"### Configuration du virtual host pour Git \n" "### (nécessitant une certificat)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"chemin du repertoire racine de subversion\">\n" +" <Directory \"chemin du repertoire racine de Git\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2263,8 +2263,8 @@ msgstr "Serveur basé sur Svnserve " #. (para) #: ../source/TortoiseGit_en.xml:2485 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." -msgstr "Il peut y avoir des situations où il n'est pas possible d'utiliser Apache comme serveur. Heureusement, Subversion inclut Svnserve - un serveur autonome léger qui utilise un protocole personnalisé sur une connexion TCP/IP ordinaire." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgstr "Il peut y avoir des situations où il n'est pas possible d'utiliser Apache comme serveur. Heureusement, Git inclut Svnserve - un serveur autonome léger qui utilise un protocole personnalisé sur une connexion TCP/IP ordinaire." #. (para) #: ../source/TortoiseGit_en.xml:2491 @@ -2278,23 +2278,23 @@ msgstr "Installer svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2502 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." -msgstr "Récupérez la dernière version de Subversion à cet endroit http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Vous pouvez également récupérer le programme d'installation prépackagé chez CollabNet ici : http://www.collab.net/downloads/subversion. Ce programme d'install mettra en place svnserve comme service Windows, et inclura quelques outils utiles si vous comptez utiliser SASL pour sécuriser votre serveur." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgstr "Récupérez la dernière version de Git à cet endroit http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Vous pouvez également récupérer le programme d'installation prépackagé chez CollabNet ici : http://www.collab.net/downloads/Git. Ce programme d'install mettra en place svnserve comme service Windows, et inclura quelques outils utiles si vous comptez utiliser SASL pour sécuriser votre serveur." #. (para) #: ../source/TortoiseGit_en.xml:2516 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." -msgstr "Si vous déjà une version de Subversion d'installée, et que svnserve est lancé, vous devrez l'arrêter avant de continuer." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." +msgstr "Si vous déjà une version de Git d'installée, et que svnserve est lancé, vous devrez l'arrêter avant de continuer." #. (para) #: ../source/TortoiseGit_en.xml:2522 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." -msgstr "Exécutez le programme d'installation de Subversion. Si vous l'exécutez sur votre serveur (ce qui est recommendé) vous pouvez passer l'étape 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." +msgstr "Exécutez le programme d'installation de Git. Si vous l'exécutez sur votre serveur (ce qui est recommendé) vous pouvez passer l'étape 4." #. (para) #: ../source/TortoiseGit_en.xml:2528 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "Ouvrez l'explorateur Windows, allez au répertoire d'installation de Subversion (habituellement C:\\Program Files\\Subversion) et dans le répertoire bin, trouvez les fichiers svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll et ssleay32.dll - copiez ces fichiers, ou copiez simplement tout le contenu du répertoire bin, dans un répertoire sur votre serveur, par exemple c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "Ouvrez l'explorateur Windows, allez au répertoire d'installation de Git (habituellement C:\\Program Files\\Git) et dans le répertoire bin, trouvez les fichiers svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll et ssleay32.dll - copiez ces fichiers, ou copiez simplement tout le contenu du répertoire bin, dans un répertoire sur votre serveur, par exemple c:\\svnserve" #. (title) #: ../source/TortoiseGit_en.xml:2550 @@ -2364,36 +2364,36 @@ msgstr "Exécuter svnserve en tant que service" #. (para) #: ../source/TortoiseGit_en.xml:2624 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." -msgstr "Exécuter svnserve par un utilisateur n'est généralement pas la meilleure solution. Cela revient à avoir toujours un utilisateur connecté sur votre serveur et vous rappeler de le relancer après un redémarrage. Une meilleure manière consiste à lancer svnserve en tant que service Windows. À partir de Subversion 1.4, svnserve peut être installé comme un service windows natif." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." +msgstr "Exécuter svnserve par un utilisateur n'est généralement pas la meilleure solution. Cela revient à avoir toujours un utilisateur connecté sur votre serveur et vous rappeler de le relancer après un redémarrage. Une meilleure manière consiste à lancer svnserve en tant que service Windows. À partir de Git 1.4, svnserve peut être installé comme un service windows natif." #. (para) #: ../source/TortoiseGit_en.xml:2631 msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Pour installer svnserve comme service Windows, exécutez la commande suivante. Le service sera alors créé et lancé à chaque démarrage de Windows. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\referentiel\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\referentiel\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " Si un des chemin d'accès contient des espaces, vous devrez encapsuler ceux ci avec des double cotes, comme suit : \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\referentiel\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\referentiel\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " Vous pouvez également ajouter une description après avoir créé le service. Elle sera visible depuis la fenêtre de gestion des services de Windows. \n" -"sc description svnserve \"Serveur Subversion (svnserve)\"\n" +"sc description svnserve \"Serveur Git (svnserve)\"\n" "" #. (para) @@ -2406,11 +2406,11 @@ msgstr "Notez la ligne de commande relativement atypique utilisée par msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Microsoft recommande maintenant que les services soient exécutés soit par le compte Service Local soit par le compte Service Réseau. Référez-vous The Services and Service Accounts Security Planning Guide. Pour créer le service sous le compte Service Local, ajoutez ce qui suit à l'exemple ci-dessus. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Notez que vous devriez donner au compte Service Local les droits appropriés tant pour Subversion et vos référentiels que pour toute application utilisée par les scripts hook. Le groupe intégré pour cela est appelé \"SERVICE LOCAL\"." +" Notez que vous devriez donner au compte Service Local les droits appropriés tant pour Git et vos référentiels que pour toute application utilisée par les scripts hook. Le groupe intégré pour cela est appelé \"SERVICE LOCAL\"." #. (para) #: ../source/TortoiseGit_en.xml:2678 @@ -2488,8 +2488,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2755 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" -msgstr "Si vous gérez plusieurs référentiels avec la même base de données de mots de passe, l'utilisation d'un groupe d'identification facilitera la tâche des utilisateurs, dans la mesure où TortoiseGit peut garder vos accréditations dans la mémoire cache vous n'avez à les saisir qu'une seule fois. Plus d'informations sont disponibles dans le manuel de Subversion dans les sections Create a 'users' file and realm and Client Credentials Caching" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgstr "Si vous gérez plusieurs référentiels avec la même base de données de mots de passe, l'utilisation d'un groupe d'identification facilitera la tâche des utilisateurs, dans la mesure où TortoiseGit peut garder vos accréditations dans la mémoire cache vous n'avez à les saisir qu'une seule fois. Plus d'informations sont disponibles dans le manuel de Git dans les sections Create a 'users' file and realm and Client Credentials Caching" #. (title) #: ../source/TortoiseGit_en.xml:2773 @@ -2508,13 +2508,13 @@ msgstr "Qu'est-ce que SASL ?" #. (para) #: ../source/TortoiseGit_en.xml:2779 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." -msgstr "La couche d'authentification et de sécurisation Cyrus est open source et développée par l'université Carnegie Mellon. Elle étoffe les protocoles réseau de capacités d'authentification et de cryptage, et tout comme Subversion à partir de sa version 1.5, svnserve et TortoiseGit savent utiliser de cette librairie." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgstr "La couche d'authentification et de sécurisation Cyrus est open source et développée par l'université Carnegie Mellon. Elle étoffe les protocoles réseau de capacités d'authentification et de cryptage, et tout comme Git à partir de sa version 1.5, svnserve et TortoiseGit savent utiliser de cette librairie." #. (para) #: ../source/TortoiseGit_en.xml:2787 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." -msgstr "Pour plus de détails sur les options disponibles, consultez la section Using svnserve with SASL du manuel de référence de Subversion. Si vous recherchez un moyen simple de mettre en place un système d'authentification et de cryptage sur un serveur Windows, de manière à pouvoir accéder à votre référentiel depuis le gros méchant Internet, continuez à lire." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgstr "Pour plus de détails sur les options disponibles, consultez la section Using svnserve with SASL du manuel de référence de Git. Si vous recherchez un moyen simple de mettre en place un système d'authentification et de cryptage sur un serveur Windows, de manière à pouvoir accéder à votre référentiel depuis le gros méchant Internet, continuez à lire." #. (title) #: ../source/TortoiseGit_en.xml:2800 @@ -2534,13 +2534,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2810 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." -msgstr "Ensuite, créez un fichier nommé svn.conf au bon endroit - typiquement dans le réportoire d'installation de Subversion." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." +msgstr "Ensuite, créez un fichier nommé svn.conf au bon endroit - typiquement dans le réportoire d'installation de Git." #. (para) #: ../source/TortoiseGit_en.xml:2815 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." -msgstr "Troisièmement, créer deux clefs de registre pour indiquer à SASL où trouver les éléments. Créez une clé nommée [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] et insérez y deux valeurs de type chaine de caractère: SearchPath ayant comme valeur le chemin contenant le greffon sasl*.dll (qui est normalement le répertoire d'installation de Subversion), et ConfFile ayant comme valeur le chemin contenant le fichier svn.conf. Si vous avez utilisé le programme d'installation de CollabNet, ces clés auront déjà été créées pour vous." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgstr "Troisièmement, créer deux clefs de registre pour indiquer à SASL où trouver les éléments. Créez une clé nommée [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] et insérez y deux valeurs de type chaine de caractère: SearchPath ayant comme valeur le chemin contenant le greffon sasl*.dll (qui est normalement le répertoire d'installation de Git), et ConfFile ayant comme valeur le chemin contenant le fichier svn.conf. Si vous avez utilisé le programme d'installation de CollabNet, ces clés auront déjà été créées pour vous." #. (para) #: ../source/TortoiseGit_en.xml:2827 @@ -2629,8 +2629,8 @@ msgstr "Une méthode simple pour mettre en place votre serveur est donnée là : #. (para) #: ../source/TortoiseGit_en.xml:2915 -msgid "Further information about svnserve can be found in the Version Control with Subversion." -msgstr "Plus d'informations sur svnserve dans Version Control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." +msgstr "Plus d'informations sur svnserve dans Version Control with Git." #. (title) #: ../source/TortoiseGit_en.xml:2923 @@ -2640,25 +2640,25 @@ msgstr "Autorisation basée sur le chemin avec svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" -"En démarrant avec Subversion 1.3, svnserve supporte le même arrangement d'autorisation à base de chemin mod_authz_svn qui est disponible avec le serveur Apache. Vous devez éditer le fichier conf/svnserve.conf dans votre répertoire de référentiel et ajouter une ligne se référant à votre fichier d'autorisation. \n" +"En démarrant avec Git 1.3, svnserve supporte le même arrangement d'autorisation à base de chemin mod_authz_svn qui est disponible avec le serveur Apache. Vous devez éditer le fichier conf/svnserve.conf dans votre répertoire de référentiel et ajouter une ligne se référant à votre fichier d'autorisation. \n" "[general]\n" "authz-db = authz\n" " Ici, authz est un fichier que vous créez pour définir les autorisations d'accès. Vous pouvez utiliser un fichier séparé pour chaque référentiel, ou vous pouvez utiliser le même fichier pour plusieurs référentiels. Lisez pour une description du format du fichier." #. (para) #: ../source/TortoiseGit_en.xml:2946 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." -msgstr "Peu importe le protocole que vous utilisez pour avoir accès à vos référentiels, vous devez toujours créer au moins un référentiel. Cela peut être fait soit avec le client de ligne de commande de Subversion soit avec TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." +msgstr "Peu importe le protocole que vous utilisez pour avoir accès à vos référentiels, vous devez toujours créer au moins un référentiel. Cela peut être fait soit avec le client de ligne de commande de Git soit avec TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:2951 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "Si vous n'avez pas encore créé de référentiel Subversion, il est temps de le faire maintenant." +msgid "If you haven't created a Git repository yet, it's time to do that now." +msgstr "Si vous n'avez pas encore créé de référentiel Git, il est temps de le faire maintenant." #. (title) #: ../source/TortoiseGit_en.xml:2959 @@ -2672,8 +2672,8 @@ msgstr "Créer un référentiel" #. (para) #: ../source/TortoiseGit_en.xml:2963 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." -msgstr "Vous pouvez créer un référentiel avec le backend FSFS ou avec le format de base de données Berkeley (BDB) plus ancien. Le format de FSFS est plus rapide et plus facile à gérer, il fonctionne maintenant sur les partages réseau et sous Windows 98 sans problème. Le format BDB est considéré comme plus stable car il est utilisé depuis plus longtemps ; cependant, FSFS est maintenant utilisé depuis plusieurs années, donc cet argument est dépassé. Lisez Choosing a Data Store dans le manuel de Subversion pour plus d'informations." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." +msgstr "Vous pouvez créer un référentiel avec le backend FSFS ou avec le format de base de données Berkeley (BDB) plus ancien. Le format de FSFS est plus rapide et plus facile à gérer, il fonctionne maintenant sur les partages réseau et sous Windows 98 sans problème. Le format BDB est considéré comme plus stable car il est utilisé depuis plus longtemps ; cependant, FSFS est maintenant utilisé depuis plusieurs années, donc cet argument est dépassé. Lisez Choosing a Data Store dans le manuel de Git pour plus d'informations." #. (title) #: ../source/TortoiseGit_en.xml:2978 @@ -2784,8 +2784,8 @@ msgstr "Chemins UNC" #. (para) #: ../source/TortoiseGit_en.xml:3094 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." -msgstr "Pour accéder à votre référentiel local vous avez besoin du chemin vers ce dossier. Souvenez-vous juste que Subversion s'attend à des chemins de référentiels dans la forme file:///C:/SVNRéférentiel/. Notez l'utilisation de slashs." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgstr "Pour accéder à votre référentiel local vous avez besoin du chemin vers ce dossier. Souvenez-vous juste que Git s'attend à des chemins de référentiels dans la forme file:///C:/SVNRéférentiel/. Notez l'utilisation de slashs." #. (para) #: ../source/TortoiseGit_en.xml:3100 @@ -2825,8 +2825,8 @@ msgstr "Premièrement vous donnez le droit d'accès en écriture dans le référ #. (para) #: ../source/TortoiseGit_en.xml:3141 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." -msgstr "Ensuite, tous les protocoles d'échange de fichiers ne supportent pas le verouillage dont Subversion a besoin, donc votre référentiel peut être corrompu. Ca ne devrait pas arriver tout de suite, mais un jour deux utilisateurs vont essayer d'accéder au référentiel en même temps." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgstr "Ensuite, tous les protocoles d'échange de fichiers ne supportent pas le verouillage dont Git a besoin, donc votre référentiel peut être corrompu. Ca ne devrait pas arriver tout de suite, mais un jour deux utilisateurs vont essayer d'accéder au référentiel en même temps." #. (para) #: ../source/TortoiseGit_en.xml:3147 @@ -2929,8 +2929,8 @@ msgstr "Si vous adoptez une approche de niveau supérieur /trunk /tags #. (para) #: ../source/TortoiseGit_en.xml:3220 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." -msgstr "Pour les projets sans rapport vous pouvez préférer utiliser des référentiels séparés. Quand vous livrez des changements, c'est le numéro de révision du référentiel entier qui change, pas le numéro de révision du projet. Avoir 2 projets sans rapport qui partagent un référentiel peut signifier de grands écarts dans les numéros de révision. Les projets Subversion et TortoiseGit apparaissent à la même adresse hôte, mais sont des référentiels complètement séparés permettant le développement indépendant et aucune confusion sur les numéros de génération." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgstr "Pour les projets sans rapport vous pouvez préférer utiliser des référentiels séparés. Quand vous livrez des changements, c'est le numéro de révision du référentiel entier qui change, pas le numéro de révision du projet. Avoir 2 projets sans rapport qui partagent un référentiel peut signifier de grands écarts dans les numéros de révision. Les projets Git et TortoiseGit apparaissent à la même adresse hôte, mais sont des référentiels complètement séparés permettant le développement indépendant et aucune confusion sur les numéros de génération." #. (para) #: ../source/TortoiseGit_en.xml:3230 @@ -3018,8 +3018,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3332 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "L'outil svnadmin est installé automatiquement quand vous installez le client de ligne de commande de Subversion. Si vous installez les outils de ligne de commande sur un PC Windows, la meilleure façon est de télécharger la version d'installeur Windows. Il est compressé plus efficacement que la version .zip, donc le téléchargement est plus petit et il s'occupe de configurer les chemins pour vous. Vous pouvez télécharger la dernière version du client de ligne de commande de Subversion à partir de http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "L'outil svnadmin est installé automatiquement quand vous installez le client de ligne de commande de Git. Si vous installez les outils de ligne de commande sur un PC Windows, la meilleure façon est de télécharger la version d'installeur Windows. Il est compressé plus efficacement que la version .zip, donc le téléchargement est plus petit et il s'occupe de configurer les chemins pour vous. Vous pouvez télécharger la dernière version du client de ligne de commande de Git à partir de http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:3347 @@ -3046,8 +3046,8 @@ msgstr "Scripts de hook côté serveur" #. (para) #: ../source/TortoiseGit_en.xml:3357 #, fuzzy -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." -msgstr "Un script hook est un programme déclenché par un certain événement du référentiel, comme la création d'une nouvelle révision ou la modification d'une propriété non versionnée. À chaque hook est fourni suffisamment d'informations pour dire de quel événement il s'agit, sur quelle(s) cible(s) il doit fonctionner et le nom utilisateur de la personne qui a déclenché l'événement. Selon le résultat du hook ou le statut retourné, le programme hook peut continuer l'action, l'arrêter, ou la suspendre d'une certaine façon. Veuillez vous référez au chapitre sur Hook Scripts dans le manuel de Subversion pour plus de détails sur la façon dont les hooks sont mis en place." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." +msgstr "Un script hook est un programme déclenché par un certain événement du référentiel, comme la création d'une nouvelle révision ou la modification d'une propriété non versionnée. À chaque hook est fourni suffisamment d'informations pour dire de quel événement il s'agit, sur quelle(s) cible(s) il doit fonctionner et le nom utilisateur de la personne qui a déclenché l'événement. Selon le résultat du hook ou le statut retourné, le programme hook peut continuer l'action, l'arrêter, ou la suspendre d'une certaine façon. Veuillez vous référez au chapitre sur Hook Scripts dans le manuel de Git pour plus de détails sur la façon dont les hooks sont mis en place." #. (para) #: ../source/TortoiseGit_en.xml:3372 @@ -3098,8 +3098,8 @@ msgstr "Site internet" #. (para) #: ../source/TortoiseGit_en.xml:3411 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." -msgstr "Si vous voulez donner l'accès à votre référentiel Subversion à d'autres utilisateurs, vous pouvez vouloir mettre un lien vers celui-ci sur votre site Web. Une façon de rendre ceci plus accessible est d'inclure un lien d'extraction pour les autres utilisateurs de TortoiseGit." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgstr "Si vous voulez donner l'accès à votre référentiel Git à d'autres utilisateurs, vous pouvez vouloir mettre un lien vers celui-ci sur votre site Web. Une façon de rendre ceci plus accessible est d'inclure un lien d'extraction pour les autres utilisateurs de TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:3417 @@ -3164,18 +3164,18 @@ msgstr "Guide d'utilisation quotidienne" #. (para) #: ../source/TortoiseGit_en.xml:3457 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." -msgstr "Ce document décrit l'utilisation quotidienne du client TortoiseGit. Ce n'est pas une introduction aux systèmes de contrôle de version, ni une introduction à Subversion (SVN). C'est plutôt un endroit où vous pouvez regarder quand vous savez approximativement ce que vous voulez faire, mais vous ne vous rappelez pas tout à fait comment le faire." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgstr "Ce document décrit l'utilisation quotidienne du client TortoiseGit. Ce n'est pas une introduction aux systèmes de contrôle de version, ni une introduction à Git (SVN). C'est plutôt un endroit où vous pouvez regarder quand vous savez approximativement ce que vous voulez faire, mais vous ne vous rappelez pas tout à fait comment le faire." #. (para) #: ../source/TortoiseGit_en.xml:3465 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." -msgstr "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion.Si vous avez besoin d'une introduction au contrôle de version avec Subversion, alors nous vous recommandons la lecture du livre fantastique : Version Control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." +msgstr "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git.Si vous avez besoin d'une introduction au contrôle de version avec Git, alors nous vous recommandons la lecture du livre fantastique : Version Control with Git." #. (para) #: ../source/TortoiseGit_en.xml:3472 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." -msgstr "Ce document est aussi un travail en cours, de même que TortoiseGit et Subversion. Si vous trouvez des erreurs, veuillez les annoncer sur la mailing list pour que nous puissions mettre à jour la documentation. Certaines copies d'écran dans le Guide d'Utilisation Quotidienne (GUQ) pourraient ne pas refléter l'état actuel du logiciel. Veuillez nous pardonner. Nous travaillons sur TortoiseGit pendant notre temps libre." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgstr "Ce document est aussi un travail en cours, de même que TortoiseGit et Git. Si vous trouvez des erreurs, veuillez les annoncer sur la mailing list pour que nous puissions mettre à jour la documentation. Certaines copies d'écran dans le Guide d'Utilisation Quotidienne (GUQ) pourraient ne pas refléter l'état actuel du logiciel. Veuillez nous pardonner. Nous travaillons sur TortoiseGit pendant notre temps libre." #. (para) #: ../source/TortoiseGit_en.xml:3484 @@ -3189,13 +3189,13 @@ msgstr "Vous devriez être familier avec les systèmes de contrôle de version." #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." -msgstr "Vous devez connaître les bases de Subversion." +msgid "You should know the basics of Git." +msgstr "Vous devez connaître les bases de Git." #. (para) #: ../source/TortoiseGit_en.xml:3499 -msgid "You should have set up a server and/or have access to a Subversion repository." -msgstr "Vous devriez avoir mis en place un serveur et/ou avoir accès à un référentiel Subversion." +msgid "You should have set up a server and/or have access to a Git repository." +msgstr "Vous devriez avoir mis en place un serveur et/ou avoir accès à un référentiel Git." #. (para) #: ../source/TortoiseGit_en.xml:3480 @@ -3384,13 +3384,13 @@ msgstr "svn.username contient les accréditations pour l'au #. (para) #: ../source/TortoiseGit_en.xml:3650 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " -msgstr "Si le référentiel auquel vous essayez d'avoir accès est protégé par un mot de passe, une boîte de dialogue d'identification s'affichera. Entrez votre nom d'utilisateur et votre mot de passe. La case à cocher fera que TortoiseGit stockera les accréditations dans le répertoire de Subversion par défaut : %APPDATA%\\Subversion\\auth dans trois sous-répertoires : " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " +msgstr "Si le référentiel auquel vous essayez d'avoir accès est protégé par un mot de passe, une boîte de dialogue d'identification s'affichera. Entrez votre nom d'utilisateur et votre mot de passe. La case à cocher fera que TortoiseGit stockera les accréditations dans le répertoire de Git par défaut : %APPDATA%\\Git\\auth dans trois sous-répertoires : " #. (para) #: ../source/TortoiseGit_en.xml:3681 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." -msgstr "Si vous voulez effacer le cache d'authentification pour tous les serveurs, vous pouvez le faire à partir de la page Données Sauvegardées de la boîte de dialogue de configuration de TortoiseGit. Ce bouton effacera toutes les données d'authentification gardées en cache dans les répertoire auth de Subversion, aussi bien que les authentifications stockées par des versions précédemment installées de TortoiseGit. Référez-vous à ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgstr "Si vous voulez effacer le cache d'authentification pour tous les serveurs, vous pouvez le faire à partir de la page Données Sauvegardées de la boîte de dialogue de configuration de TortoiseGit. Ce bouton effacera toutes les données d'authentification gardées en cache dans les répertoire auth de Git, aussi bien que les authentifications stockées par des versions précédemment installées de TortoiseGit. Référez-vous à ." #. (para) #: ../source/TortoiseGit_en.xml:3690 @@ -3465,7 +3465,7 @@ msgstr "Il est aisé de se tromper de répertoire à importer dans le référent #. (para) #: ../source/TortoiseGit_en.xml:3736 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "Cette section décrit la commande Importer, qui a été faite pour importer une arborescence de répertoire dans le référentiel en une action. Bien que cette commande fonctionne, elle a quelques défauts: Pour ces raisons nous recommandons d'utiliser la méthode en deux étapes descrite dans : au lieu de cette commande . Mais puisque vous êtes là, c'est le fonctionnement de la commande Importer..." #. (para) @@ -3587,8 +3587,8 @@ msgstr "Comme exemple, vous pouvez regarder le script de construction de Tortois #. (para) #: ../source/TortoiseGit_en.xml:3916 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." -msgstr "Afin de ne pas déranger les utilisateurs, nous avons aussi ajouté le fichier TortoiseVars.bat à la liste des ignorés de son dossier parent, c'est-à-dire nous avons mis la propriété Subversion svn:ignore pour inclure ce nom de fichier. De cette façon il n'apparaîtra pas comme non versionné à chaque livraison." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgstr "Afin de ne pas déranger les utilisateurs, nous avons aussi ajouté le fichier TortoiseVars.bat à la liste des ignorés de son dossier parent, c'est-à-dire nous avons mis la propriété Git svn:ignore pour inclure ce nom de fichier. De cette façon il n'apparaîtra pas comme non versionné à chaque livraison." #. (title) #: ../source/TortoiseGit_en.xml:3925 @@ -3615,17 +3615,17 @@ msgstr "Il est parfois utile de construire une copie de travail faite d'un certa #. (para) #: ../source/TortoiseGit_en.xml:3940 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" -"Si vous souhaitez extraire une copie de travail du /projet1 dans D:\\dev\\projet1. Sélectionnez le dossier D:\\dev\\projet1, faites un click droit et choisissez Menu WindowsPropriétés dans le menu contextuel. La boîte de dialogue Propriétés apparaît. Allez alors dans l'onglet Subversion. Là, vous pouvez modifier des propriétés. Choisissez la propriété svn:externals dans la liste déroulante et écrivez dans la boîte de saisie l'URL du référentiel dans le format nom url ou si vous voulez spécifier une révision particulière, nom -rREV url Vous pouvez ajouter plusieurs projets externes, 1 par ligne. Notez que les URL doivent être correctement saisies ou elles ne fonctionneront pas correctement. Par exemple vous devez remplacer chaque espace par %20. Notez qu'il n'est pas possible d'utiliser des noms de dossier avec des espaces dedans. Supposons que vous avez mis ces propriétés sur D:\\dev\\projet1 : \n" +"Si vous souhaitez extraire une copie de travail du /projet1 dans D:\\dev\\projet1. Sélectionnez le dossier D:\\dev\\projet1, faites un click droit et choisissez Menu WindowsPropriétés dans le menu contextuel. La boîte de dialogue Propriétés apparaît. Allez alors dans l'onglet Git. Là, vous pouvez modifier des propriétés. Choisissez la propriété svn:externals dans la liste déroulante et écrivez dans la boîte de saisie l'URL du référentiel dans le format nom url ou si vous voulez spécifier une révision particulière, nom -rREV url Vous pouvez ajouter plusieurs projets externes, 1 par ligne. Notez que les URL doivent être correctement saisies ou elles ne fonctionneront pas correctement. Par exemple vous devez remplacer chaque espace par %20. Notez qu'il n'est pas possible d'utiliser des noms de dossier avec des espaces dedans. Supposons que vous avez mis ces propriétés sur D:\\dev\\projet1 : \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Cliquez maintenant sur Définir et livrez vos changements. Quand vous (ou un autre utilisateur) mettez à jour votre copie de travail, Subversion créera un sous-dossier D:\\dev\\projet1\\sounds et extraira le projet de sons, un autre sous-dossier D:\\dev\\projet1\\quick graphs contenant le projet de graphiques et finalement un sous-dossier emboîté D:\\dev\\projet1\\skins\\toolkit contenant la révision 21 du projet de fabricant de skins." +" Cliquez maintenant sur Définir et livrez vos changements. Quand vous (ou un autre utilisateur) mettez à jour votre copie de travail, Git créera un sous-dossier D:\\dev\\projet1\\sounds et extraira le projet de sons, un autre sous-dossier D:\\dev\\projet1\\quick graphs contenant le projet de graphiques et finalement un sous-dossier emboîté D:\\dev\\projet1\\skins\\toolkit contenant la révision 21 du projet de fabricant de skins." #. (para) #: ../source/TortoiseGit_en.xml:3980 @@ -3654,8 +3654,8 @@ msgstr "Si vous utilisez des URL absolues dans la valeur de l'option sv #. (para) #: ../source/TortoiseGit_en.xml:4016 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." -msgstr "Pour éviter de tels problèmes, à partir de la version 1.5 du client Subversion permet d'utiliser les chemins relatifs dans les références externes. Quatres méthodes différentes de spécifications d'URL sont supportées. Dans les exemples suivants, considérez qu'il y a deux référentiels: un premier ici http://exemple.com/svn/repos-1 et un second ici http://exemple.com/svn/repos-2. Nous avons une extraction de http://exemple.com/svn/repos-1/project/trunk dans C:\\Working et la propriété svn:externals est activée sur le répertoire trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgstr "Pour éviter de tels problèmes, à partir de la version 1.5 du client Git permet d'utiliser les chemins relatifs dans les références externes. Quatres méthodes différentes de spécifications d'URL sont supportées. Dans les exemples suivants, considérez qu'il y a deux référentiels: un premier ici http://exemple.com/svn/repos-1 et un second ici http://exemple.com/svn/repos-2. Nous avons une extraction de http://exemple.com/svn/repos-1/project/trunk dans C:\\Working et la propriété svn:externals est activée sur le répertoire trunk." #. (term) #: ../source/TortoiseGit_en.xml:4031 @@ -3884,8 +3884,8 @@ msgstr "Répéter le même processus pour Project25.." #. (para) #: ../source/TortoiseGit_en.xml:4298 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." -msgstr "Allez dans Project76/SubProj et faites de même. Cette fois ci, notez que le répertoire Project76 est vide excepté SubProj, lequel est complètement rempli. Subversion a créé pour vous les répertoires intermédiaires sans les remplir." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." +msgstr "Allez dans Project76/SubProj et faites de même. Cette fois ci, notez que le répertoire Project76 est vide excepté SubProj, lequel est complètement rempli. Git a créé pour vous les répertoires intermédiaires sans les remplir." #. (title) #: ../source/TortoiseGit_en.xml:4308 @@ -3894,8 +3894,8 @@ msgstr "La profondeur de la copie de travail ne peut être réduite" #. (para) #: ../source/TortoiseGit_en.xml:4309 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." -msgstr "Une fois que vous avez extrait une copie de travail à une certaine profondeur vous pouvez augmenter celle ci plus tard pour avoir plus de contenu. Cependant, vous ne pouvez la réduire pour retirer du contenu. Cette fonctionnalité sera ajoutée dans une version future de Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." +msgstr "Une fois que vous avez extrait une copie de travail à une certaine profondeur vous pouvez augmenter celle ci plus tard pour avoir plus de contenu. Cependant, vous ne pouvez la réduire pour retirer du contenu. Cette fonctionnalité sera ajoutée dans une version future de Git." #. (title) #: ../source/TortoiseGit_en.xml:4317 @@ -4039,7 +4039,7 @@ msgstr "Les colonnes affichées dans le panneau du bas sont personnalisables. Si #. (para) #: ../source/TortoiseGit_en.xml:4495 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." msgstr "" #. (para) @@ -4063,7 +4063,7 @@ msgstr "Réparation des renommages externes" #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5337 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #. (title) @@ -4075,8 +4075,8 @@ msgstr "Listes de changements" #. (para) #: ../source/TortoiseGit_en.xml:4539 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." -msgstr "La fenêtre de livraison supporte la fonctionnalité liste des modifications de Subversion et s'en sert pour grouper les fichiers. Pour en savoir plus sur cette fonctionnalité vois ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." +msgstr "La fenêtre de livraison supporte la fonctionnalité liste des modifications de Git et s'en sert pour grouper les fichiers. Pour en savoir plus sur cette fonctionnalité vois ." #. (title) #: ../source/TortoiseGit_en.xml:4546 @@ -4366,8 +4366,8 @@ msgstr "Le fichier local existe déjà" #. (para) #: ../source/TortoiseGit_en.xml:4881 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." -msgstr "Parfois quand vous essayez de mettre à jour, la mise à jour échoue avec un message disant qu'il y a déjà un fichier local du même nom. Cela arrive typiquement quand Subversion essaye d'extraire un fichier nouvellement versionné et constate qu'un fichier non versionné du même nom existe déjà dans votre dossier de travail. Subversion n'écrasera jamais un fichier non versionné - il pourrait contenir quelque chose sur lequel vous travaillez, qui a par hasard le même nom de fichier qu'un autre développeur a utilisé pour son fichier nouvellement livré." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgstr "Parfois quand vous essayez de mettre à jour, la mise à jour échoue avec un message disant qu'il y a déjà un fichier local du même nom. Cela arrive typiquement quand Git essaye d'extraire un fichier nouvellement versionné et constate qu'un fichier non versionné du même nom existe déjà dans votre dossier de travail. Git n'écrasera jamais un fichier non versionné - il pourrait contenir quelque chose sur lequel vous travaillez, qui a par hasard le même nom de fichier qu'un autre développeur a utilisé pour son fichier nouvellement livré." #. (para) #: ../source/TortoiseGit_en.xml:4890 @@ -4416,27 +4416,27 @@ msgstr "nom_du_fichier.ext.rNEWREV" #. (para) #: ../source/TortoiseGit_en.xml:4960 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." -msgstr "C'est le fichier que votre client de Subversion venait de recevoir du serveur quand vous avez mis à jour votre copie de travail. Ce fichier correspond à la révision de tête du référentiel." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgstr "C'est le fichier que votre client de Git venait de recevoir du serveur quand vous avez mis à jour votre copie de travail. Ce fichier correspond à la révision de tête du référentiel." #. (para) #: ../source/TortoiseGit_en.xml:4915 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" -"De temps à autre, vous obtiendrez un conflit lors d'une mise à jour de vos fichiers à partir du référentiel. Un conflit se produit quand deux développeurs ou plus ont changé les mêmes lignes d'un fichier. Comme Subversion ne connaît rien à votre projet, il laisse la résolution des conflits aux développeurs. Chaque fois qu'un conflit est annoncé, vous devriez ouvrir le fichier en question et rechercher des lignes commençant par la chaîne <<<<<<<. La zone en conflit est marquée comme cela : \n" +"De temps à autre, vous obtiendrez un conflit lors d'une mise à jour de vos fichiers à partir du référentiel. Un conflit se produit quand deux développeurs ou plus ont changé les mêmes lignes d'un fichier. Comme Git ne connaît rien à votre projet, il laisse la résolution des conflits aux développeurs. Chaque fois qu'un conflit est annoncé, vous devriez ouvrir le fichier en question et rechercher des lignes commençant par la chaîne <<<<<<<. La zone en conflit est marquée comme cela : \n" "<<<<<<< nom du fichier\n" " vos changements\n" "=======\n" " code fusionné du référentiel\n" ">>>>>>> révision\n" -" Aussi, pour chaque fichier en conflit Subversion place trois fichiers supplémentaires dans votre répertoire : " +" Aussi, pour chaque fichier en conflit Git place trois fichiers supplémentaires dans votre répertoire : " #. (para) #: ../source/TortoiseGit_en.xml:4970 @@ -4450,8 +4450,8 @@ msgstr "Exécutez ensuite la commande TortoiseGit #. (para) #: ../source/TortoiseGit_en.xml:4994 -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." -msgstr "Si vous avez des conflits avec des fichiers binaires, Subversion n'essaye pas de fusionner les fichiers lui-même. Le fichier local reste inchangé (exactement comme la dernière fois que vous l'avez modifié) et vous avez des fichiers nom_du_fichier.ext.r*. Si vous voulez renoncer à vos changements et garder la version du référentiel, utilisez simplement la commande Revenir en arrière. Si vous voulez garder votre version et écraser la version du référentiel, utilisez la commande Résolu..., livrez ensuite votre version." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgstr "Si vous avez des conflits avec des fichiers binaires, Git n'essaye pas de fusionner les fichiers lui-même. Le fichier local reste inchangé (exactement comme la dernière fois que vous l'avez modifié) et vous avez des fichiers nom_du_fichier.ext.r*. Si vous voulez renoncer à vos changements et garder la version du référentiel, utilisez simplement la commande Revenir en arrière. Si vous voulez garder votre version et écraser la version du référentiel, utilisez la commande Résolu..., livrez ensuite votre version." #. (para) #: ../source/TortoiseGit_en.xml:5004 @@ -4499,13 +4499,13 @@ msgstr "icônes" #. (para) #: ../source/TortoiseGit_en.xml:5046 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "Maintenant que vous avez extrait une copie de travail à partir d'un référentiel Subversion, vous pouvez voir vos fichiers dans l'explorateur Windows avec des icônes changées. C'est une des raisons pour laquelle TortoiseGit est si populaire. TortoiseGit ajoute une icône de recouvrement à chaque icône de fichier chevauchant l'icône de fichier originale. Selon le statut Subversion du fichier, l'icône de recouvrement est différente." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." +msgstr "Maintenant que vous avez extrait une copie de travail à partir d'un référentiel Git, vous pouvez voir vos fichiers dans l'explorateur Windows avec des icônes changées. C'est une des raisons pour laquelle TortoiseGit est si populaire. TortoiseGit ajoute une icône de recouvrement à chaque icône de fichier chevauchant l'icône de fichier originale. Selon le statut Git du fichier, l'icône de recouvrement est différente." #. (para) #: ../source/TortoiseGit_en.xml:5054 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " Une copie de travail fraîchement extraite a une coche verte comme icône de recouvrement. Cela signifie que le statut Subversion est normal." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " Une copie de travail fraîchement extraite a une coche verte comme icône de recouvrement. Cela signifie que le statut Git est normal." #. (para) #: ../source/TortoiseGit_en.xml:5059 @@ -4519,13 +4519,13 @@ msgstr " Si un conflit #. (para) #: ../source/TortoiseGit_en.xml:5072 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." -msgstr " Si vous avez mis la propriété svn:needs-lock sur un fichier, Subversion met ce fichier en lecture seule jusqu'à ce que vous verrouilliez ce fichier. Ces fichiers ont cette icône de recouvrement pour indiquer que vous devez d'abord les verrouiller pour pouvoir les éditer." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgstr " Si vous avez mis la propriété svn:needs-lock sur un fichier, Git met ce fichier en lecture seule jusqu'à ce que vous verrouilliez ce fichier. Ces fichiers ont cette icône de recouvrement pour indiquer que vous devez d'abord les verrouiller pour pouvoir les éditer." #. (para) #: ../source/TortoiseGit_en.xml:5079 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." -msgstr " Si vous avez verrouilé un fichier et que le statut de Subversion est normal, cette icône de recouvrement vous rappelle que vous devriez relâcher le verrou si vous ne l'utilisez pas pour permettre aux autres utilisateurs de livrer leurs changements." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgstr " Si vous avez verrouilé un fichier et que le statut de Git est normal, cette icône de recouvrement vous rappelle que vous devriez relâcher le verrou si vous ne l'utilisez pas pour permettre aux autres utilisateurs de livrer leurs changements." #. (para) #: ../source/TortoiseGit_en.xml:5086 @@ -4563,8 +4563,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5124 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." -msgstr "Pour avoir une description des icones de recouvrement correspondant aux statuts de Subversion et d'autres détails techniques, lisez ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." +msgstr "Pour avoir une description des icones de recouvrement correspondant aux statuts de Git et d'autres détails techniques, lisez ." #. (title) #: ../source/TortoiseGit_en.xml:5131 @@ -4689,7 +4689,7 @@ msgstr "Les colonnes affichées dans le panneau du bas sont personnalisables. Si #: ../source/TortoiseGit_en.xml:5310 #, fuzzy msgid "If you are working on several unrelated tasks at once, you can also group files together into changelists. Read for more information." -msgstr "Vous pouvez configurer Subversion pour définir automatiquement des propriétés sur les fichiers et sur les dossiers lorsqu'ils sont ajoutés au référentiel. Lisez pour plus d'informations." +msgstr "Vous pouvez configurer Git pour définir automatiquement des propriétés sur les fichiers et sur les dossiers lorsqu'ils sont ajoutés au référentiel. Lisez pour plus d'informations." #. (para) #: ../source/TortoiseGit_en.xml:5315 @@ -5005,8 +5005,8 @@ msgstr "Copier les commentaires des révisions sélectionnées dans le presse pa #. (para) #: ../source/TortoiseGit_en.xml:5742 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." -msgstr "Chercher les commentaires correspondants au texte que vous entrez. Cela recherche dans les commentaires que vous avez saisis et aussi les résumés d'action créés par Subversion (montré dans le panneau du bas). La recherche n'est pas sensible à la casse." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." +msgstr "Chercher les commentaires correspondants au texte que vous entrez. Cela recherche dans les commentaires que vous avez saisis et aussi les résumés d'action créés par Git (montré dans le panneau du bas). La recherche n'est pas sensible à la casse." #. (para) #: ../source/TortoiseGit_en.xml:5581 @@ -5095,8 +5095,8 @@ msgstr "Annuler les changements effectués au fichier sélectionné dans cette r #. (para) #: ../source/TortoiseGit_en.xml:5843 -msgid "View the Subversion properties for the selected item." -msgstr "Voir les propriétés Subversion pour l'élément sélectionné." +msgid "View the Git properties for the selected item." +msgstr "Voir les propriétés Git pour l'élément sélectionné." #. (para) #: ../source/TortoiseGit_en.xml:5848 @@ -5120,18 +5120,18 @@ msgstr "Vous avez peut être remarqué que nous faisons parfois référence à d #. (para) #: ../source/TortoiseGit_en.xml:5865 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." -msgstr "Subversion utilise des numéros de révision pour deux raisons. Une révision représente l'état d'un référentiel à un moment donné, elle peut aussi matérialiser la liste des modifications ayant mené à cette révision, i.e. Fait dans r1234 veux dire que l'implémentation de la fonctionalité X a été faite via les modifications livrées dans la r1234. Pour connaitre le sens d'une révision, nous utilisons deux termes différents." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgstr "Git utilise des numéros de révision pour deux raisons. Une révision représente l'état d'un référentiel à un moment donné, elle peut aussi matérialiser la liste des modifications ayant mené à cette révision, i.e. Fait dans r1234 veux dire que l'implémentation de la fonctionalité X a été faite via les modifications livrées dans la r1234. Pour connaitre le sens d'une révision, nous utilisons deux termes différents." #. (para) #: ../source/TortoiseGit_en.xml:5874 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." -msgstr "Si vous sélectionnez deux révisions N et M, le menu contextuel vous permettra de voir les différences entre ces deux révisions. Dans Subversion, cette opération correspond à la commande diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." +msgstr "Si vous sélectionnez deux révisions N et M, le menu contextuel vous permettra de voir les différences entre ces deux révisions. Dans Git, cette opération correspond à la commande diff -r M:N." #. (para) #: ../source/TortoiseGit_en.xml:5880 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." -msgstr "Si vous sélectionnez une seule révision N, le menu contextuel vous proposera d'afficher les modifications faites dans cette révision. Dans le jargon de Subversion cela se traduit par diff -r N-1:N ou diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." +msgstr "Si vous sélectionnez une seule révision N, le menu contextuel vous proposera d'afficher les modifications faites dans cette révision. Dans le jargon de Git cela se traduit par diff -r N-1:N ou diff -c N." #. (para) #: ../source/TortoiseGit_en.xml:5886 @@ -5167,8 +5167,8 @@ msgstr "Quand la boîte de dialogue Voir le journal est appelée depuis la boît #. (para) #: ../source/TortoiseGit_en.xml:5935 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." -msgstr "Notez que Subversion met actuellement en oeuvre le renommage comme une paire copie/suppression, donc renommer un fichier ou un dossier causera aussi l'arrêt de l'affichage du journal si cette option est cochée." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgstr "Notez que Git met actuellement en oeuvre le renommage comme une paire copie/suppression, donc renommer un fichier ou un dossier causera aussi l'arrêt de l'affichage du journal si cette option est cochée." #. (para) #: ../source/TortoiseGit_en.xml:5894 @@ -5222,7 +5222,7 @@ msgstr "bug tracking" #. (para) #: ../source/TortoiseGit_en.xml:5990 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." msgstr "" #. (title) @@ -5258,8 +5258,8 @@ msgstr "Parfois vous pourriez vouloir changer un commentaire que vous avez saisi #. (para) #: ../source/TortoiseGit_en.xml:6031 #, fuzzy -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." -msgstr "Subversion vous laisse changer tant le commentaire que l'auteur des révisions quand vous le souhaitez. Mais puisque de tels changements ne peuvent pas être annulés (ces changements ne sont pas versionnés) cette fonctionnalité est désactivée par défaut. Pour faire que cela fonctionne, vous devez mettre en place un hook pre-revprop-change. Veuillez vous référer au chapitre sur Hook Scripts dans le manuel de Subversion pour plus de détails sur la façon de le faire. Lisez pour trouver plus de notes sur l'implémentation de hooks sur une machine Windows." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgstr "Git vous laisse changer tant le commentaire que l'auteur des révisions quand vous le souhaitez. Mais puisque de tels changements ne peuvent pas être annulés (ces changements ne sont pas versionnés) cette fonctionnalité est désactivée par défaut. Pour faire que cela fonctionne, vous devez mettre en place un hook pre-revprop-change. Veuillez vous référer au chapitre sur Hook Scripts dans le manuel de Git pour plus de détails sur la façon de le faire. Lisez pour trouver plus de notes sur l'implémentation de hooks sur une machine Windows." #. (para) #: ../source/TortoiseGit_en.xml:6044 @@ -5269,8 +5269,8 @@ msgstr "Une fois que vous avez mis en place votre serveur avec les hooks requis, #. (para) #: ../source/TortoiseGit_en.xml:6051 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." -msgstr "Parce que les propriétés de révision de Subversion ne sont pas versionnées, modifier une telle propriété (par exemple, la propriété du commentaire de livraison svn:log) écrasera la valeur précédente de cette propriété pour toujours." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgstr "Parce que les propriétés de révision de Git ne sont pas versionnées, modifier une telle propriété (par exemple, la propriété du commentaire de livraison svn:log) écrasera la valeur précédente de cette propriété pour toujours." #. (title) #: ../source/TortoiseGit_en.xml:6061 @@ -5321,8 +5321,8 @@ msgstr "Pas de Formattage des Commentaires depuis l'Explorateur de Référentiel #. (para) #: ../source/TortoiseGit_en.xml:6119 #, fuzzy -msgid "Because the formatting depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." -msgstr "Le formattage dépend des propriétés d'accès de subversion, vous ne verrez que le résultat lorsque vous utiliserez une copie de travail exportée. Afficher les propriétés à distance étant une opération lente, vous ne pourrez pas l'effectuer depuis l'explorateur de référentiel." +msgid "Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgstr "Le formattage dépend des propriétés d'accès de Git, vous ne verrez que le résultat lorsque vous utiliserez une copie de travail exportée. Afficher les propriétés à distance étant une opération lente, vous ne pourrez pas l'effectuer depuis l'explorateur de référentiel." #. (title) #: ../source/TortoiseGit_en.xml:6129 @@ -5544,8 +5544,8 @@ msgstr "Différence entre fichiers/répertoires de la CdT et une URL" #. (para) #: ../source/TortoiseGit_en.xml:6382 #, fuzzy -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." -msgstr "Si vous voulez voir les différences entre un fichier de votre copie de travail, et un fichier dans un référentiel Subversion, vous pouvez le faire directement dans l'explorateur en sélectionnant le fichier puis en maintenant la touche Shift en faisant un clic droit pour obtenir le menu contextuel. Sélectionnez TortoiseGitDiff avec l'URL. Vous pouvez faire la même chose pour un répertoire de la copie de travail. TortoiseMerge vous montre ces différences de la même manière qu'un patch - une liste des fichiers modifiés que vous pouvez voir un par un." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgstr "Si vous voulez voir les différences entre un fichier de votre copie de travail, et un fichier dans un référentiel Git, vous pouvez le faire directement dans l'explorateur en sélectionnant le fichier puis en maintenant la touche Shift en faisant un clic droit pour obtenir le menu contextuel. Sélectionnez TortoiseGitDiff avec l'URL. Vous pouvez faire la même chose pour un répertoire de la copie de travail. TortoiseMerge vous montre ces différences de la même manière qu'un patch - une liste des fichiers modifiés que vous pouvez voir un par un." #. (term) #: ../source/TortoiseGit_en.xml:6400 @@ -5946,7 +5946,7 @@ msgstr "étiquette" #. (para) #: ../source/TortoiseGit_en.xml:6826 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." msgstr "" #. (para) @@ -6036,8 +6036,8 @@ msgstr "La liste des ignorés globale" #. (para) #: ../source/TortoiseGit_en.xml:6958 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." -msgstr "Une autre façon d'ignorer des fichiers est de les ajouter à la liste des ignorés globale. La grande différence ici, c'est que la liste des ignorés globale est une propriété client. Elle s'applique à tous les projets Subversion, mais sur le PC client uniquement. En général, c'est mieux d'utiliser la propriété svn:ignore où c'est possible, parce qu'elle peut être appliquée à des secteurs spécifiques du projet et elle fonctionne pour tous ceux qui extraient le projet. Lisez pour plus d'informations." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgstr "Une autre façon d'ignorer des fichiers est de les ajouter à la liste des ignorés globale. La grande différence ici, c'est que la liste des ignorés globale est une propriété client. Elle s'applique à tous les projets Git, mais sur le PC client uniquement. En général, c'est mieux d'utiliser la propriété svn:ignore où c'est possible, parce qu'elle peut être appliquée à des secteurs spécifiques du projet et elle fonctionne pour tous ceux qui extraient le projet. Lisez pour plus d'informations." #. (title) #: ../source/TortoiseGit_en.xml:6971 @@ -6046,8 +6046,8 @@ msgstr "Ignorer les éléments versionnés" #. (para) #: ../source/TortoiseGit_en.xml:6972 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." -msgstr "Les fichiers et les répertoires versionnés ne peuvent jamais être ignorés - c'est une fonctionnalité de Subversion. Si vous avez versionné un fichier par erreur, lisez pour savoir comment le déversionner." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." +msgstr "Les fichiers et les répertoires versionnés ne peuvent jamais être ignorés - c'est une fonctionnalité de Git. Si vous avez versionné un fichier par erreur, lisez pour savoir comment le déversionner." #. (title) #: ../source/TortoiseGit_en.xml:6980 @@ -6096,8 +6096,8 @@ msgstr "Correspond à n'importe lequel des caractères inclus dans les crochets. #. (para) #: ../source/TortoiseGit_en.xml:6987 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " -msgstr "Les modèles d'exclusion de Subversion se servent de l'expansion des jokers (globbing) dans les noms de fichier, une technique à l'origine utilisée sous Unix pour spécifier des fichiers utilisant des méta-caractères comme caractères de remplacement. Les caractères suivants ont une signification spéciale : " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgstr "Les modèles d'exclusion de Git se servent de l'expansion des jokers (globbing) dans les noms de fichier, une technique à l'origine utilisée sous Unix pour spécifier des fichiers utilisant des méta-caractères comme caractères de remplacement. Les caractères suivants ont une signification spéciale : " #. (para) #: ../source/TortoiseGit_en.xml:7027 @@ -6131,8 +6131,8 @@ msgstr "Menu contextuel de l'explorateur pour les fichiers non versionnés" #. (para) #: ../source/TortoiseGit_en.xml:7062 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " -msgstr "À la différence de CVS, Subversion permet de renommer et de déplacer des fichiers et des dossiers. Il y a donc des entrées de menu pour supprimer et renommer dans le sous-menu de TortoiseGit. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgstr "À la différence de CVS, Git permet de renommer et de déplacer des fichiers et des dossiers. Il y a donc des entrées de menu pour supprimer et renommer dans le sous-menu de TortoiseGit. " #. (title) #: ../source/TortoiseGit_en.xml:7072 @@ -6152,7 +6152,7 @@ msgstr "enlever" #. (para) #: ../source/TortoiseGit_en.xml:7079 #, fuzzy -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "TortoiseGitSupprimer le dossier de votre copie de travail." #. (para) @@ -6163,7 +6163,7 @@ msgstr "Si vous supprimez un fichier/répertoire en utilisant TSVN, le fichier e #. (para) #: ../source/TortoiseGit_en.xml:7103 -msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." msgstr "" #. (para) @@ -6173,13 +6173,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7131 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." -msgstr "Si un fichier est supprimé via l'explorateur au lieu d'utiliser le menu contextuel TortoiseGit, la boîte de dialogue Livrer affiche ces fichiers et vous laisse aussi les supprimer du contrôle de version avant la livraison. Cependant, si vous mettez à jour votre copie de travail, Subversion découvrira le fichier manquant et le remplacera par la dernière version du référentiel. Si vous devez supprimer un fichier sous contrôle de version, utilisez toujours TortoiseGitSupprimer pour que Subversion n'ait pas à deviner ce que vous voulez vraiment faire." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." +msgstr "Si un fichier est supprimé via l'explorateur au lieu d'utiliser le menu contextuel TortoiseGit, la boîte de dialogue Livrer affiche ces fichiers et vous laisse aussi les supprimer du contrôle de version avant la livraison. Cependant, si vous mettez à jour votre copie de travail, Git découvrira le fichier manquant et le remplacera par la dernière version du référentiel. Si vous devez supprimer un fichier sous contrôle de version, utilisez toujours TortoiseGitSupprimer pour que Git n'ait pas à deviner ce que vous voulez vraiment faire." #. (para) #: ../source/TortoiseGit_en.xml:7145 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." -msgstr "Si un dossier est supprimé via l'explorateur au lieu d'utiliser le menu contextuel TortoiseGit, votre copie de travail sera cassée et vous serez incapables de livrer. Si vous mettez à jour votre copie de travail, Subversion remplacera le dossier manquant avec la dernière version du référentiel et vous pourrez alors le supprimer correctement en utilisant TortoiseGitSupprimer." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgstr "Si un dossier est supprimé via l'explorateur au lieu d'utiliser le menu contextuel TortoiseGit, votre copie de travail sera cassée et vous serez incapables de livrer. Si vous mettez à jour votre copie de travail, Git remplacera le dossier manquant avec la dernière version du référentiel et vous pourrez alors le supprimer correctement en utilisant TortoiseGitSupprimer." #. (title) #: ../source/TortoiseGit_en.xml:7158 @@ -6224,7 +6224,7 @@ msgstr "sélectionnez les fichiers ou les répertoires que vous voulez déplacer #. (para) #: ../source/TortoiseGit_en.xml:7220 msgid "in the popup menu select Context MenuSVN Move versioned files here" -msgstr "Dans le menu qui apparaît, sélectionnez Menu contextuelSVN Déplacer les fichiers dans Subversion ici" +msgstr "Dans le menu qui apparaît, sélectionnez Menu contextuelSVN Déplacer les fichiers dans Git ici" #. (para) #: ../source/TortoiseGit_en.xml:7198 @@ -6276,14 +6276,14 @@ msgstr "Changements de casse" #. (para) #: ../source/TortoiseGit_en.xml:7274 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7280 #, fuzzy -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" -msgstr "Il y a (au moins) deux façons de renommer un fichier sans perdre son historique de journal. C'est important de le renommer au sein de Subversion. Le renommer seulement dans l'explorateur corrompra votre copie de travail !!!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" +msgstr "Il y a (au moins) deux façons de renommer un fichier sans perdre son historique de journal. C'est important de le renommer au sein de Git. Le renommer seulement dans l'explorateur corrompra votre copie de travail !!!" #. (para) #: ../source/TortoiseGit_en.xml:7290 @@ -6335,7 +6335,7 @@ msgstr "Gestion des conflits de nom de fichier." #. (para) #: ../source/TortoiseGit_en.xml:7336 #, fuzzy -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." msgstr "Dans le cas où vous avez deux fichiers dans le référentiel avec le même nom mais qui ne diffèrent qu'avec la casse (par exemple TEST.TXT et test.txt) vous ne pouvez plus mettre à jour ou extraire le répertoire où se trouvent ces fichiers." #. (para) @@ -6365,12 +6365,12 @@ msgstr "Réparer les renommages de fichier" #. (para) #: ../source/TortoiseGit_en.xml:7368 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7376 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #. (title) @@ -6380,7 +6380,7 @@ msgstr "Supprimer les fichiers non versionnés" #. (para) #: ../source/TortoiseGit_en.xml:7391 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." msgstr "" #. (para) @@ -6476,14 +6476,14 @@ msgstr "nettoyer" #. (para) #: ../source/TortoiseGit_en.xml:7493 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." -msgstr "Si une commande Subversion ne peut pas s'achever avec succès, peut-être en raison de problèmes serveur, votre copie de travail peut être laissée dans un état incohérent. Dans ce cas, vous devez utiliser TortoiseGitNettoyer sur le dossier. C'est une bonne idée de le faire au niveau supérieur de la copie de travail." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgstr "Si une commande Git ne peut pas s'achever avec succès, peut-être en raison de problèmes serveur, votre copie de travail peut être laissée dans un état incohérent. Dans ce cas, vous devez utiliser TortoiseGitNettoyer sur le dossier. C'est une bonne idée de le faire au niveau supérieur de la copie de travail." #. (para) #: ../source/TortoiseGit_en.xml:7504 #, fuzzy -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." -msgstr "Le nettoyage a un autre effet secondaire utile. Si une date de fichier change mais pas son contenu, Subversion ne peut dire s'il a vraiment changé qu'en faisant une comparaison octet-par-octet avec la copie primitive. Si vous avez beaucoup de fichiers dans cet état, cela rend la récupération du statut très lente, ce qui fera que beaucoup de boîtes de dialogue seront lentes à répondre. Exécuter un nettoyage sur votre copie de travail réparera ces horodatages cassés et rendra aux contrôles de statut leur pleine vitesse." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgstr "Le nettoyage a un autre effet secondaire utile. Si une date de fichier change mais pas son contenu, Git ne peut dire s'il a vraiment changé qu'en faisant une comparaison octet-par-octet avec la copie primitive. Si vous avez beaucoup de fichiers dans cet état, cela rend la récupération du statut très lente, ce qui fera que beaucoup de boîtes de dialogue seront lentes à répondre. Exécuter un nettoyage sur votre copie de travail réparera ces horodatages cassés et rendra aux contrôles de statut leur pleine vitesse." #. (title) #: ../source/TortoiseGit_en.xml:7515 @@ -6492,8 +6492,8 @@ msgstr "Utiliser les horodatages de livraison" #. (para) #: ../source/TortoiseGit_en.xml:7516 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." -msgstr "Des sorties précédentes de Subversion ont été affectées par un bug qui a causé des incohérences dans l'horodatage quand vous extrayez avec l'option Utiliser les horodatages de livraison cochée. Utilisez la commande Nettoyer pour accélérer ces copies de travail." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgstr "Des sorties précédentes de Git ont été affectées par un bug qui a causé des incohérences dans l'horodatage quand vous extrayez avec l'option Utiliser les horodatages de livraison cochée. Utilisez la commande Nettoyer pour accélérer ces copies de travail." #. (title) #: ../source/TortoiseGit_en.xml:7526 @@ -6507,40 +6507,40 @@ msgstr "propriétés" #. (title) #: ../source/TortoiseGit_en.xml:7532 -msgid "Explorer property page, Subversion tab" -msgstr "Page de propriétés de l'explorateur, onglet Subversion" +msgid "Explorer property page, Git tab" +msgstr "Page de propriétés de l'explorateur, onglet Git" #. (para) #: ../source/TortoiseGit_en.xml:7530 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." -msgstr " Parfois vous voulez avoir des informations plus détaillées sur un fichier/répertoire qu'un recouvrement d'icône. Vous pouvez obtenir toutes les informations que Subversion fournit dans la boîte de dialogue de propriétés de l'explorateur. Sélectionnez seulement le fichier ou le répertoire et choisissez Menu WindowsPropriétés dans le menu contextuel (note : c'est l'entrée de menu de propriétés standard que l'explorateur fournit, pas celle du sous-menu TortoiseGit !). Dans la boîte de dialogue de propriétés, TortoiseGit a ajouté une nouvelle page de propriété pour les fichiers/dossiers sous le contrôle de Subversion où vous verrez toutes les informations pertinentes concernant le fichier/répertoire sélectionné." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." +msgstr " Parfois vous voulez avoir des informations plus détaillées sur un fichier/répertoire qu'un recouvrement d'icône. Vous pouvez obtenir toutes les informations que Git fournit dans la boîte de dialogue de propriétés de l'explorateur. Sélectionnez seulement le fichier ou le répertoire et choisissez Menu WindowsPropriétés dans le menu contextuel (note : c'est l'entrée de menu de propriétés standard que l'explorateur fournit, pas celle du sous-menu TortoiseGit !). Dans la boîte de dialogue de propriétés, TortoiseGit a ajouté une nouvelle page de propriété pour les fichiers/dossiers sous le contrôle de Git où vous verrez toutes les informations pertinentes concernant le fichier/répertoire sélectionné." #. (title) #: ../source/TortoiseGit_en.xml:7552 -msgid "Subversion Properties" -msgstr "Propriétés Subversion" +msgid "Git Properties" +msgstr "Propriétés Git" #. (primary) #: ../source/TortoiseGit_en.xml:7554 -msgid "Subversion properties" -msgstr "Propriétés Subversion" +msgid "Git properties" +msgstr "Propriétés Git" #. (title) #: ../source/TortoiseGit_en.xml:7560 -msgid "Subversion property page" -msgstr "Page de propriété de subversion" +msgid "Git property page" +msgstr "Page de propriété de Git" #. (para) #: ../source/TortoiseGit_en.xml:7558 #, fuzzy -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." -msgstr " Vous pouvez lire et définir les propriétés Subversion à partir de la boîte de dialogue de propriétés de Windows, mais aussi depuis TortoiseGitPropriétés et au sein de les listes de statut de TSVN, de Menu contextuelPropriétés." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgstr " Vous pouvez lire et définir les propriétés Git à partir de la boîte de dialogue de propriétés de Windows, mais aussi depuis TortoiseGitPropriétés et au sein de les listes de statut de TSVN, de Menu contextuelPropriétés." #. (para) #: ../source/TortoiseGit_en.xml:7575 #, fuzzy -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." -msgstr "Vous pouvez ajouter vos propres propriétés, ou des propriétés avec une signification spéciale pour Subversion. Celles-ci commencent par svn:. svn:externals en est une ; regardez comment manipuler les externes dans . Pour plus d'informations sur les propriétés dans Subversion, regardez le Manuel de Subversion." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgstr "Vous pouvez ajouter vos propres propriétés, ou des propriétés avec une signification spéciale pour Git. Celles-ci commencent par svn:. svn:externals en est une ; regardez comment manipuler les externes dans . Pour plus d'informations sur les propriétés dans Git, regardez le Manuel de Git." #. (title) #: ../source/TortoiseGit_en.xml:7582 @@ -6584,20 +6584,20 @@ msgstr "Une combinaison raccourcie des quatres mot clés précédents." #. (para) #: ../source/TortoiseGit_en.xml:7589 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7640 #, fuzzy -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." -msgstr "Il est important de comprendre comment l'embranchement et la fusion fonctionnent dans Subversion avant de commencer à l'utiliser, puisque cela peut devenir assez complexe. Il est fortement recommandé de lire le chapitre Branching and Merging dans le Manuel de Subversion qui donne une description complète et beaucoup d'exemples sur la façon dont c'est utilisé." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." +msgstr "Il est important de comprendre comment l'embranchement et la fusion fonctionnent dans Git avant de commencer à l'utiliser, puisque cela peut devenir assez complexe. Il est fortement recommandé de lire le chapitre Branching and Merging dans le Manuel de Git qui donne une description complète et beaucoup d'exemples sur la façon dont c'est utilisé." #. (para) #: ../source/TortoiseGit_en.xml:7650 #, fuzzy -msgid "For more information about properties in Subversion see the Special Properties." -msgstr "Plus d'informations sur svnserve dans Version Control with Subversion." +msgid "For more information about properties in Git see the Special Properties." +msgstr "Plus d'informations sur svnserve dans Version Control with Git." #. (title) #: ../source/TortoiseGit_en.xml:7657 @@ -6702,12 +6702,12 @@ msgstr "auto-props" #. (para) #: ../source/TortoiseGit_en.xml:7768 #, fuzzy -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." -msgstr "Vous pouvez configurer Subversion pour définir automatiquement des propriétés sur les fichiers et sur les dossiers lorsqu'ils sont ajoutés au référentiel. Lisez pour plus d'informations." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgstr "Vous pouvez configurer Git pour définir automatiquement des propriétés sur les fichiers et sur les dossiers lorsqu'ils sont ajoutés au référentiel. Lisez pour plus d'informations." #. (para) #: ../source/TortoiseGit_en.xml:7773 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." msgstr "" #. (para) @@ -6732,8 +6732,8 @@ msgstr "Livrer les propriétés" #. (para) #: ../source/TortoiseGit_en.xml:7810 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." -msgstr "Les propriétés de Subversion sont versionnées. Après avoir changé ou ajouté une propriété, vous devez livrer vos changements." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." +msgstr "Les propriétés de Git sont versionnées. Après avoir changé ou ajouté une propriété, vous devez livrer vos changements." #. (title) #: ../source/TortoiseGit_en.xml:7816 @@ -6742,8 +6742,8 @@ msgstr "Conflits sur les propriétés" #. (para) #: ../source/TortoiseGit_en.xml:7817 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." -msgstr "S'il y a un conflit en livrant les changements, parce qu'un autre utilisateur a changé la même propriété, Subversion génére un fichier .prej. Supprimez ce fichier après avoir résolu le conflit." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." +msgstr "S'il y a un conflit en livrant les changements, parce qu'un autre utilisateur a changé la même propriété, Git génére un fichier .prej. Supprimez ce fichier après avoir résolu le conflit." #. (title) #: ../source/TortoiseGit_en.xml:7826 @@ -6782,7 +6782,7 @@ msgstr "tsvn:logtemplate est utilisé avec les projets qui on #. (para) #: ../source/TortoiseGit_en.xml:7882 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." msgstr "" #. (para) @@ -6876,7 +6876,7 @@ msgstr "Lorsque vous ajoutez un nouveau sous répertoire via TortoiseGit, toutes #. (para) #: ../source/TortoiseGit_en.xml:8015 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." msgstr "" #. (title) @@ -6909,8 +6909,8 @@ msgstr "Une autre fonctionnalité des systèmes de contrôle de version est la c #. (para) #: ../source/TortoiseGit_en.xml:8058 #, fuzzy -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." -msgstr "Subversion n'a pas de commandes spéciales pour l'embranchement ou l'étiquetage, mais utilise de prétendues copies bon marché au lieu de cela. Les copies bon marché sont semblables aux liens durs pour Unix, ce qui signifie qu'au lieu de faire une copie complète dans le référentiel, un lien interne est créé, pointant vers un arbre/révision spécifique. Par conséquence, les branches et les étiquettes sont très rapides à créer et ne prennent presque aucun espace supplémentaire dans le référentiel." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgstr "Git n'a pas de commandes spéciales pour l'embranchement ou l'étiquetage, mais utilise de prétendues copies bon marché au lieu de cela. Les copies bon marché sont semblables aux liens durs pour Unix, ce qui signifie qu'au lieu de faire une copie complète dans le référentiel, un lien interne est créé, pointant vers un arbre/révision spécifique. Par conséquence, les branches et les étiquettes sont très rapides à créer et ne prennent presque aucun espace supplémentaire dans le référentiel." #. (title) #: ../source/TortoiseGit_en.xml:8068 @@ -7059,8 +7059,8 @@ msgstr "Si vous modifiez une copie de travail créée à partir d'une branche et #. (para) #: ../source/TortoiseGit_en.xml:8245 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " -msgstr "Bien que Subversion lui-même ne fasse aucune distinction entre les étiquettes et les branches, la manière dont elles sont typiquement utilisées diffère un peu. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgstr "Bien que Git lui-même ne fasse aucune distinction entre les étiquettes et les branches, la manière dont elles sont typiquement utilisées diffère un peu. " #. (title) #: ../source/TortoiseGit_en.xml:8289 @@ -7086,8 +7086,8 @@ msgstr "Quand les branches sont utilisées pour maintenir des lignes séparées #. (para) #: ../source/TortoiseGit_en.xml:8299 #, fuzzy -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." -msgstr "Il est important de comprendre comment l'embranchement et la fusion fonctionnent dans Subversion avant de commencer à l'utiliser, puisque cela peut devenir assez complexe. Il est fortement recommandé de lire le chapitre Branching and Merging dans le Manuel de Subversion qui donne une description complète et beaucoup d'exemples sur la façon dont c'est utilisé." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." +msgstr "Il est important de comprendre comment l'embranchement et la fusion fonctionnent dans Git avant de commencer à l'utiliser, puisque cela peut devenir assez complexe. Il est fortement recommandé de lire le chapitre Branching and Merging dans le Manuel de Git qui donne une description complète et beaucoup d'exemples sur la façon dont c'est utilisé." #. (para) #: ../source/TortoiseGit_en.xml:8309 @@ -7117,8 +7117,8 @@ msgstr "Cette méthode couvre le cas où vous avez fait une ou plusieurs révisi #. (para) #: ../source/TortoiseGit_en.xml:8342 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." -msgstr "Ce que vous demandez à Subversion est de : Calculer les modifications nécessaires pour passer [DE] la révision 1 de la branche A [A] la révision 7 de la branche A, et d'appliquer ces modifications à la copie de travail (de la racine ou de la branche B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgstr "Ce que vous demandez à Git est de : Calculer les modifications nécessaires pour passer [DE] la révision 1 de la branche A [A] la révision 7 de la branche A, et d'appliquer ces modifications à la copie de travail (de la racine ou de la branche B)." #. (term) #. (title) @@ -7130,12 +7130,12 @@ msgstr "Réintégrer une branche" #. (para) #: ../source/TortoiseGit_en.xml:8353 #, fuzzy -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." -msgstr "Cette méthode gère le cas où vous avez fait une branche de fonction comme dans le manuel de Subversion. Tous les changements du tronc ont été reportés à la branche de fonction, semaine après semaine, et maintenant que la fonction est terminée, vous voulez la fusionner dans le tronc. Parce que vous avez gardé la branche de fonction synchronisée avec le tronc, les dernières versions de la branche et du tronc seront absolument identiques à part vos modifications de la branche. Ainsi dans ce cas particulier, vous fusionneriez en comparant la branche avec le tronc." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgstr "Cette méthode gère le cas où vous avez fait une branche de fonction comme dans le manuel de Git. Tous les changements du tronc ont été reportés à la branche de fonction, semaine après semaine, et maintenant que la fonction est terminée, vous voulez la fusionner dans le tronc. Parce que vous avez gardé la branche de fonction synchronisée avec le tronc, les dernières versions de la branche et du tronc seront absolument identiques à part vos modifications de la branche. Ainsi dans ce cas particulier, vous fusionneriez en comparant la branche avec le tronc." #. (para) #: ../source/TortoiseGit_en.xml:8362 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "" #. (para) @@ -7155,12 +7155,12 @@ msgstr "Fusionner deux arborescences différentes" #. (para) #: ../source/TortoiseGit_en.xml:8392 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8400 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." msgstr "" #. (title) @@ -7206,7 +7206,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8463 -msgid "If you are merging revisions in chunks, the method shown in the subversion book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." +msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." msgstr "" #. (para) @@ -7233,7 +7233,7 @@ msgstr "Si vous avez déjà fusionné des changements de cette branche, avec bon #. (para) #: ../source/TortoiseGit_en.xml:8508 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." msgstr "" #. (para) @@ -7331,8 +7331,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8618 #, fuzzy -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" -msgstr "La plupart du temps vous voulez fusionner pour tenir compte de l'historique du fichier, pour que les changements relatifs à un ancêtre commun soient fusionnés. Parfois vous pouvez devoir fusionner des fichiers qui sont peut-être liés, mais pas dans votre référentiel. Par exemple vous pouvez avoir importé les versions 1 et 2 d'une bibliothèque tiers dans deux répertoires séparés. Bien qu'ils soient logiquement liés, Subversion n'en a aucune connaissance parce qu'il ne voit que le package que vous avez importé. Si vous essayez de fusionner les différences entre ces deux arbres vous verriez une suppression totale suivie par un ajout total. Pour faire que Subversion n'utilise que les différences basées sur le chemin plutôt que les différences basées sur l'historique, cochez la case Ignorer l'ascendance. Lisez en plus à ce sujet dans le manuel de Subversion, Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" +msgstr "La plupart du temps vous voulez fusionner pour tenir compte de l'historique du fichier, pour que les changements relatifs à un ancêtre commun soient fusionnés. Parfois vous pouvez devoir fusionner des fichiers qui sont peut-être liés, mais pas dans votre référentiel. Par exemple vous pouvez avoir importé les versions 1 et 2 d'une bibliothèque tiers dans deux répertoires séparés. Bien qu'ils soient logiquement liés, Git n'en a aucune connaissance parce qu'il ne voit que le package que vous avez importé. Si vous essayez de fusionner les différences entre ces deux arbres vous verriez une suppression totale suivie par un ajout total. Pour faire que Git n'utilise que les différences basées sur le chemin plutôt que les différences basées sur l'historique, cochez la case Ignorer l'ascendance. Lisez en plus à ce sujet dans le manuel de Git, Noticing or Ignoring Ancestry" #. (para) #: ../source/TortoiseGit_en.xml:8635 @@ -7368,12 +7368,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8679 #, fuzzy -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." -msgstr "Quand vous avez testé les changements et que vous venez pour livrer cette révision, votre commentaire de livraison devrait toujours inclure les numéros des révisions qui ont été reportées dans la fusion. Si vous voulez appliquer une autre fusion plus tard, vous aurez besoin de connaître ce que vous avez déjà fusionné, puisque vous ne voulez pas reporter un changement plus d'une fois. Malheureusement l'information de fusion n'est pas stockée par Subversion. Pour plus d'informations à ce sujet, référez-vous à Best Practices for Merging dans le manuel de Subversion." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." +msgstr "Quand vous avez testé les changements et que vous venez pour livrer cette révision, votre commentaire de livraison devrait toujours inclure les numéros des révisions qui ont été reportées dans la fusion. Si vous voulez appliquer une autre fusion plus tard, vous aurez besoin de connaître ce que vous avez déjà fusionné, puisque vous ne voulez pas reporter un changement plus d'une fois. Malheureusement l'information de fusion n'est pas stockée par Git. Pour plus d'informations à ce sujet, référez-vous à Best Practices for Merging dans le manuel de Git." #. (para) #: ../source/TortoiseGit_en.xml:8696 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "" #. (para) @@ -7390,8 +7390,8 @@ msgstr "Dans ce cas, vous n'aurez plus besoin de la branche de fonction parce qu #. (para) #: ../source/TortoiseGit_en.xml:8718 #, fuzzy -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." -msgstr "Subversion ne peut pas fusionner un fichier avec un dossier et vice versa - seulement des dossiers aux dossiers et des fichiers aux fichiers. Si vous cliquez sur un fichier et ouvrez la boîte de dialogue fusionner, vous devez alors donner un chemin vers un fichier dans cette boîte de dialogue. Si vous choisissez un dossier et affichez la boîte de dialogue, vous devez alors spécifier une URL de dossier pour la fusion." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgstr "Git ne peut pas fusionner un fichier avec un dossier et vice versa - seulement des dossiers aux dossiers et des fichiers aux fichiers. Si vous cliquez sur un fichier et ouvrez la boîte de dialogue fusionner, vous devez alors donner un chemin vers un fichier dans cette boîte de dialogue. Si vous choisissez un dossier et affichez la boîte de dialogue, vous devez alors spécifier une URL de dossier pour la fusion." #. (title) #: ../source/TortoiseGit_en.xml:8728 @@ -7430,7 +7430,7 @@ msgstr "Vous pouvez marquer les révisions comme n'étant pas à fusio #. (para) #: ../source/TortoiseGit_en.xml:8732 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " msgstr "" #. (para) @@ -7440,7 +7440,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8784 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." msgstr "" #. (title) @@ -7555,18 +7555,18 @@ msgstr "Votre société a toujours utilisé un VCS verrouillant par le passé et #. (para) #: ../source/TortoiseGit_en.xml:8918 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " -msgstr "Subversion fonctionne généralement mieux sans verrouillage, en utilisant les méthodes Copier-Modifier-Fusionner décrites plus tôt dans . Cependant il y a quelques cas où vous pouvez devoir mettre en oeuvre une certaine forme de politique de verrouillage. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgstr "Git fonctionne généralement mieux sans verrouillage, en utilisant les méthodes Copier-Modifier-Fusionner décrites plus tôt dans . Cependant il y a quelques cas où vous pouvez devoir mettre en oeuvre une certaine forme de politique de verrouillage. " #. (para) #: ../source/TortoiseGit_en.xml:8942 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." -msgstr "Premièrement, vous devez vous assurer que votre serveur Subversion est mis à jour au moins à la version 1.2. Les versions précédentes ne supportent pas le verrouillage. Si vous utilisez un accès de type file://, alors il est sûr que votre client doit être mis à jour." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgstr "Premièrement, vous devez vous assurer que votre serveur Git est mis à jour au moins à la version 1.2. Les versions précédentes ne supportent pas le verrouillage. Si vous utilisez un accès de type file://, alors il est sûr que votre client doit être mis à jour." #. (title) #: ../source/TortoiseGit_en.xml:8949 -msgid "How Locking Works in Subversion" -msgstr "Comment le verrouillage fonctionne dans Subversion" +msgid "How Locking Works in Git" +msgstr "Comment le verrouillage fonctionne dans Git" #. (para) #: ../source/TortoiseGit_en.xml:8950 @@ -7580,8 +7580,8 @@ msgstr "Si vous obtenez un verrou sur un fichier, alors v #. (para) #: ../source/TortoiseGit_en.xml:8963 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." -msgstr "Toutefois, les autres utilisateurs ne sauront pas nécessairement que vous avez pris un verrou. À moins qu'ils ne vérifient le statut du verrou régulièrement, ils le sauront la première fois lorsque leur livraison échouera, ce qui n'est pas très utile dans la plupart des cas. Pour rendre la gestion des verrous plus facile, il existe une nouvelle propriété Subversion svn:needs-lock. Quand cette propriété est définie (avec n'importe quelle valeur) sur un fichier, chaque fois que le fichier est extrait ou mis à jour, la copie locale est mise en lecture seule à moins que la copie de travail ne détienne un verrou pour le fichier. Cela agit comme un avertissement pour ne pas éditer ce fichier à moins que vous n'ayez d'abord acquis un verrou. Les fichiers qui sont versionnés et en lecture seule sont marqués avec un recouvrement spécial dans TortoiseGit pour indiquer que vous devez acquérir un verrou avant l'édition." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgstr "Toutefois, les autres utilisateurs ne sauront pas nécessairement que vous avez pris un verrou. À moins qu'ils ne vérifient le statut du verrou régulièrement, ils le sauront la première fois lorsque leur livraison échouera, ce qui n'est pas très utile dans la plupart des cas. Pour rendre la gestion des verrous plus facile, il existe une nouvelle propriété Git svn:needs-lock. Quand cette propriété est définie (avec n'importe quelle valeur) sur un fichier, chaque fois que le fichier est extrait ou mis à jour, la copie locale est mise en lecture seule à moins que la copie de travail ne détienne un verrou pour le fichier. Cela agit comme un avertissement pour ne pas éditer ce fichier à moins que vous n'ayez d'abord acquis un verrou. Les fichiers qui sont versionnés et en lecture seule sont marqués avec un recouvrement spécial dans TortoiseGit pour indiquer que vous devez acquérir un verrou avant l'édition." #. (para) #: ../source/TortoiseGit_en.xml:8979 @@ -7590,8 +7590,8 @@ msgstr "Les verrous sont enregistrées par emplacement de copie de travail et pa #. (para) #: ../source/TortoiseGit_en.xml:8985 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." -msgstr "Si l'un de vos collaborateurs acquiert un verrou et part ensuite en vacances sans le relâcher, que faites-vous ? Subversion fournit un moyen de forcer les verrous. Relâcher un verrou détenu par quelqu'un d'autre est connu comme Casser le verrou et l'acquisition de force d'un verrou déjà détenu par quelqu'un d'autre s'appelle Voler le verrou. Naturellement, ce ne sont pas des choses que vous devriez faire à la légère si vous voulez rester ami avec vos collaborateurs." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgstr "Si l'un de vos collaborateurs acquiert un verrou et part ensuite en vacances sans le relâcher, que faites-vous ? Git fournit un moyen de forcer les verrous. Relâcher un verrou détenu par quelqu'un d'autre est connu comme Casser le verrou et l'acquisition de force d'un verrou déjà détenu par quelqu'un d'autre s'appelle Voler le verrou. Naturellement, ce ne sont pas des choses que vous devriez faire à la légère si vous voulez rester ami avec vos collaborateurs." #. (para) #: ../source/TortoiseGit_en.xml:8995 @@ -7660,8 +7660,8 @@ msgstr "Évitez de casser et de voler les verrous" #. (para) #: ../source/TortoiseGit_en.xml:9086 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." -msgstr "Si vous cassez ou volez le verrou de quelqu'un d'autre sans le lui dire, vous pourriez potentiellement causer une perte du travail. Si vous travaillez avec des types de fichier non fusionnables et que vous volez le verrou de quelqu'un d'autre, une fois que vous relâchez le verrou, ils sont libres de livrer leurs changements et d'écraser les vôtres. Subversion ne perd pas de données, mais vous avez perdu la protection du travail en équipe que le verrouillage vous a donnée." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." +msgstr "Si vous cassez ou volez le verrou de quelqu'un d'autre sans le lui dire, vous pourriez potentiellement causer une perte du travail. Si vous travaillez avec des types de fichier non fusionnables et que vous volez le verrou de quelqu'un d'autre, une fois que vous relâchez le verrou, ils sont libres de livrer leurs changements et d'écraser les vôtres. Git ne perd pas de données, mais vous avez perdu la protection du travail en équipe que le verrouillage vous a donnée." #. (title) #: ../source/TortoiseGit_en.xml:9098 @@ -7675,8 +7675,8 @@ msgstr "Comme mentionné ci-dessus, la façon la plus efficace d'utiliser le ver #. (para) #: ../source/TortoiseGit_en.xml:9109 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." -msgstr "Si vous pratiquez une politique où chaque fichier doit être verrouillé, vous pouvez trouver alors plus facile d'utiliser la fonctionnalité auto-props de Subversion pour définir la propriété automatiquement à chaque fois vous ajoutez de nouveaux fichiers. Lisez pour plus d'informations." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgstr "Si vous pratiquez une politique où chaque fichier doit être verrouillé, vous pouvez trouver alors plus facile d'utiliser la fonctionnalité auto-props de Git pour définir la propriété automatiquement à chaque fois vous ajoutez de nouveaux fichiers. Lisez pour plus d'informations." #. (title) #: ../source/TortoiseGit_en.xml:9118 @@ -7685,8 +7685,8 @@ msgstr "Les scripts hook de verrouillage" #. (para) #: ../source/TortoiseGit_en.xml:9119 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." -msgstr "Quand vous créez un nouveau référentiel avec Subversion 1.2 ou supérieur, quatre modèles de hooks sont créés dans le répertoire hooks du référentiel. Ceux-ci sont appelés avant et après l'obtention d'un verrou et avant et après la libération d'un verrou." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgstr "Quand vous créez un nouveau référentiel avec Git 1.2 ou supérieur, quatre modèles de hooks sont créés dans le répertoire hooks du référentiel. Ceux-ci sont appelés avant et après l'obtention d'un verrou et avant et après la libération d'un verrou." #. (para) #: ../source/TortoiseGit_en.xml:9125 @@ -8365,8 +8365,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9967 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." -msgstr "Parce que Subversion ne peut pas fournir toutes les informations requises, une certaine dose d'interprétation est demandée, ce qui peut parfois donner des résultats étranges. Néanmoins, le résultat pour le tronc donnera généralement des résultats utiles." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgstr "Parce que Git ne peut pas fournir toutes les informations requises, une certaine dose d'interprétation est demandée, ce qui peut parfois donner des résultats étranges. Néanmoins, le résultat pour le tronc donnera généralement des résultats utiles." #. (para) #: ../source/TortoiseGit_en.xml:9977 @@ -8380,8 +8380,8 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:9996 -msgid "Exporting a Subversion Working Copy" -msgstr "Exporter une copie de travail Subversion" +msgid "Exporting a Git Working Copy" +msgstr "Exporter une copie de travail Git" #. (primary) #: ../source/TortoiseGit_en.xml:9998 @@ -8439,8 +8439,8 @@ msgstr "Extraire quelques fichiers" #. (para) #: ../source/TortoiseGit_en.xml:10071 -msgid "The export dialog does not allow exporting single files, even though Subversion can." -msgstr "La boite de dialogue d'exportation ne permet pas d'extraire juste quelques fichiers, même si Subversion le permet." +msgid "The export dialog does not allow exporting single files, even though Git can." +msgstr "La boite de dialogue d'exportation ne permet pas d'extraire juste quelques fichiers, même si Git le permet." #. (para) #: ../source/TortoiseGit_en.xml:10075 @@ -8537,8 +8537,8 @@ msgstr "C'est une opération très rare. La commande reloca #. (para) #: ../source/TortoiseGit_en.xml:10171 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." -msgstr "Vous voulez vous déplacer vers un référentiel Subversion différent. Dans ce cas, vous devriez exécuter une extraction fraîche à partir du nouvel emplacement du référentiel." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." +msgstr "Vous voulez vous déplacer vers un référentiel Git différent. Dans ce cas, vous devriez exécuter une extraction fraîche à partir du nouvel emplacement du référentiel." #. (para) #: ../source/TortoiseGit_en.xml:10177 @@ -8582,8 +8582,8 @@ msgstr "bug tracker" #. (para) #: ../source/TortoiseGit_en.xml:10211 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." -msgstr "Il est très fréquent dans le développement logiciel que les changements soient liés à un bug spécifique ou à un ID d'incident. Les utilisateurs de systèmes de traque de bug (traqueurs d'incidents) voudraient associer les changements qu'ils font dans Subversion avec un ID spécifique dans leur traqueur d'incidents. La plupart des traqueurs fournissent donc un script hook de pre-commit qui analyse syntaxiquement le commentaire pour trouver l'ID du bug auquel la livraison est associée. C'est quelque peu sujet aux erreurs puisque cela compte sur l'utilisateur pour écrire le commentaire correctement pour que le script hook de pre-commit puisse en faire l'analyse syntaxique correctement." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgstr "Il est très fréquent dans le développement logiciel que les changements soient liés à un bug spécifique ou à un ID d'incident. Les utilisateurs de systèmes de traque de bug (traqueurs d'incidents) voudraient associer les changements qu'ils font dans Git avec un ID spécifique dans leur traqueur d'incidents. La plupart des traqueurs fournissent donc un script hook de pre-commit qui analyse syntaxiquement le commentaire pour trouver l'ID du bug auquel la livraison est associée. C'est quelque peu sujet aux erreurs puisque cela compte sur l'utilisateur pour écrire le commentaire correctement pour que le script hook de pre-commit puisse en faire l'analyse syntaxique correctement." #. (para) #: ../source/TortoiseGit_en.xml:10224 @@ -8776,14 +8776,14 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10518 -msgid "Because the issue tracker integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10525 #, fuzzy -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." -msgstr "Cette intégration de tracker d'incidents n'est pas limité à TortoiseGit ; elle peut être utilisée avec n'importe quel client Subversion. Pour plus d'informations, lisez Issuetracker Integration Specification." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgstr "Cette intégration de tracker d'incidents n'est pas limité à TortoiseGit ; elle peut être utilisée avec n'importe quel client Git. Pour plus d'informations, lisez Issuetracker Integration Specification." #. (title) #: ../source/TortoiseGit_en.xml:10536 @@ -8837,7 +8837,7 @@ msgstr "WebSVN" #. (para) #: ../source/TortoiseGit_en.xml:10588 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." msgstr "" #. (para) @@ -8869,7 +8869,7 @@ msgstr "l'explorateur de référentiel" #. (para) #: ../source/TortoiseGit_en.xml:10684 -msgid "Because the repo viewer integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "" #. (title) @@ -8904,8 +8904,8 @@ msgstr "La boîte de dialogue Configuration, page Général" #. (para) #: ../source/TortoiseGit_en.xml:10710 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." -msgstr " Cette boîte de dialogue vous permet de spécifier votre langue préférée et la configuration spécifique à Subversion." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." +msgstr " Cette boîte de dialogue vous permet de spécifier votre langue préférée et la configuration spécifique à Git." #. (term) #: ../source/TortoiseGit_en.xml:10720 @@ -8975,13 +8975,13 @@ msgstr "Les modèles d'exclusion globaux sont utilisés pour empêcher des fichi #. (para) #: ../source/TortoiseGit_en.xml:10792 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." -msgstr "Notez que les modèles d'exclusion que vous spécifiez ici affecteront aussi les autres clients Subversion fonctionnant sur votre PC, y compris le client en ligne de commande." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." +msgstr "Notez que les modèles d'exclusion que vous spécifiez ici affecteront aussi les autres clients Git fonctionnant sur votre PC, y compris le client en ligne de commande." #. (para) #: ../source/TortoiseGit_en.xml:10798 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." -msgstr "Si vous utilisez le fichier de configuration de Subversion pour définir un modèle global-ignores, il ignorera les réglages que vous faites ici. Le fichier de configuration de Subversion est accessible en utilisant Éditer comme décrit ci-dessous." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." +msgstr "Si vous utilisez le fichier de configuration de Git pour définir un modèle global-ignores, il ignorera les réglages que vous faites ici. Le fichier de configuration de Git est accessible en utilisant Éditer comme décrit ci-dessous." #. (para) #: ../source/TortoiseGit_en.xml:10806 @@ -9001,14 +9001,14 @@ msgstr "Cette option indique à TortoiseGit de mettre la date des fichiers à la #. (term) #: ../source/TortoiseGit_en.xml:10834 -msgid "Subversion configuration file" -msgstr "Fichier de configuration de Subversion" +msgid "Git configuration file" +msgstr "Fichier de configuration de Git" #. (para) #: ../source/TortoiseGit_en.xml:10836 #, fuzzy -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." -msgstr "Utilisez Éditer pour éditer directement le fichier de configuration de Subversion. Quelques réglages ne peuvent pas être modifiés directement par TortoiseGit et ont besoin d'être définis ici à la place. Pour plus d'informations concernant le fichier config Subversion, regardez le Manuel Subversion. La section sur Automatic Property Setting a beacoup d'intérêt et c'est ce qui se configure ici. Notez que Subversion peut lire l'information de configuration depuis plusieurs endroits et vous devez savoir lequel à la priorité. Référez-vous à Configuration and the Windows Registry pour en savoir plus." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgstr "Utilisez Éditer pour éditer directement le fichier de configuration de Git. Quelques réglages ne peuvent pas être modifiés directement par TortoiseGit et ont besoin d'être définis ici à la place. Pour plus d'informations concernant le fichier config Git, regardez le Manuel Git. La section sur Automatic Property Setting a beacoup d'intérêt et c'est ce qui se configure ici. Notez que Git peut lire l'information de configuration depuis plusieurs endroits et vous devez savoir lequel à la priorité. Référez-vous à Configuration and the Windows Registry pour en savoir plus." #. (term) #: ../source/TortoiseGit_en.xml:10861 @@ -9017,13 +9017,13 @@ msgstr "Utiliser les répertoires _svn au lieu de .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." -msgstr "VS.NET quand il est utilisé avec des projets web ne peut pas manipuler les répertoires .svn que Subversion utilise pour stocker son information interne. Ce n'est pas un bug de Subversion. Le bug est dans VS.NET et les extensions frontpage qu'il utilise. Lisez pour en savoir plus sur cet incident." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgstr "VS.NET quand il est utilisé avec des projets web ne peut pas manipuler les répertoires .svn que Git utilise pour stocker son information interne. Ce n'est pas un bug de Git. Le bug est dans VS.NET et les extensions frontpage qu'il utilise. Lisez pour en savoir plus sur cet incident." #. (para) #: ../source/TortoiseGit_en.xml:10870 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." -msgstr "Si vous voulez changer le comportement de Subversion et de TortoiseGit, vous pouvez utiliser cette case à cocher pour définir la variable d'environnement qui contrôle cela." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgstr "Si vous voulez changer le comportement de Git et de TortoiseGit, vous pouvez utiliser cette case à cocher pour définir la variable d'environnement qui contrôle cela." #. (para) #: ../source/TortoiseGit_en.xml:10875 @@ -9123,8 +9123,8 @@ msgstr "Fermeture automatique s'il n'y a pas de conflit ass #. (para) #: ../source/TortoiseGit_en.xml:10993 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." -msgstr "Fermeture automatique s'il n'y a pas d'erreur ferme toujours la boîte de dialogue même s'il y a eu des conflits. La seule condition qui maintient la boîte de dialogue ouverte est un cas d'erreur, qui se produit quand Subversion est incapable d'achever la tâche. Par exemple, une mise à jour échoue parce que le serveur est inaccessible, ou une livraison échoue parce que la copie de travail est périmée." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgstr "Fermeture automatique s'il n'y a pas d'erreur ferme toujours la boîte de dialogue même s'il y a eu des conflits. La seule condition qui maintient la boîte de dialogue ouverte est un cas d'erreur, qui se produit quand Git est incapable d'achever la tâche. Par exemple, une mise à jour échoue parce que le serveur est inaccessible, ou une livraison échoue parce que la copie de travail est périmée." #. (term) #: ../source/TortoiseGit_en.xml:11005 @@ -9502,13 +9502,13 @@ msgstr "Les Chemins exclus sont utilisés pour indiquer à #. (para) #: ../source/TortoiseGit_en.xml:11407 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "f:\\dévelopement\\SVN\\Subversion désactivera les recouvrements seulement sur ce dossier spécifique. Vous pouvez toujours voir les recouvrements sur tous les fichiers et tous les dossiers à l'intérieur de ce dossier." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "f:\\dévelopement\\SVN\\Git désactivera les recouvrements seulement sur ce dossier spécifique. Vous pouvez toujours voir les recouvrements sur tous les fichiers et tous les dossiers à l'intérieur de ce dossier." #. (para) #: ../source/TortoiseGit_en.xml:11412 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "f:\\development\\SVN\\Subversion* désactivera les recouvrements sur tous les fichiers et dossiers dont le chemin commence par f:\\development\\SVN\\Subversion. Cela signifie que vous ne verrez pas de recouvrement pour aucun des fichiers et des dossiers en-dessous de ce chemin." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "f:\\development\\SVN\\Git* désactivera les recouvrements sur tous les fichiers et dossiers dont le chemin commence par f:\\development\\SVN\\Git. Cela signifie que vous ne verrez pas de recouvrement pour aucun des fichiers et des dossiers en-dessous de ce chemin." #. (para) #: ../source/TortoiseGit_en.xml:11419 @@ -9602,8 +9602,8 @@ msgstr " Vous pouvez ici configurer votre serveur proxy, si vous #. (para) #: ../source/TortoiseGit_en.xml:11514 #, fuzzy -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." -msgstr "Si vous devez mettre en place des réglages de proxy par référentiel, vous devez utiliser le fichier servers de Subversion. Utilisez Éditer pour y accéder directement. Consultez le Manuel Subversion pour plus de détails sur la façon d'utiliser ce fichier." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgstr "Si vous devez mettre en place des réglages de proxy par référentiel, vous devez utiliser le fichier servers de Git. Utilisez Éditer pour y accéder directement. Consultez le Manuel Git pour plus de détails sur la façon d'utiliser ce fichier." #. (para) #: ../source/TortoiseGit_en.xml:11524 @@ -9635,7 +9635,7 @@ msgstr "Pour que le mot de passe ne vous soit pas demandé à chaque fois, vous #. (para) #: ../source/TortoiseGit_en.xml:11564 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." msgstr "" #. (title) @@ -9732,8 +9732,8 @@ msgstr "Si vous utilisez la propriété svn:keywords pour dé #. (para) #: ../source/TortoiseGit_en.xml:11680 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." -msgstr "Vous pouvez aussi indiquer un autre outil de diff pour les propriétés Subversion. Dans la mesure où ce sont de courtes chaines de caractères, il est légitime de vouloir une visionneuse plus compacte." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgstr "Vous pouvez aussi indiquer un autre outil de diff pour les propriétés Git. Dans la mesure où ce sont de courtes chaines de caractères, il est légitime de vouloir une visionneuse plus compacte." #. (para) #: ../source/TortoiseGit_en.xml:11685 @@ -9912,8 +9912,8 @@ msgstr "Données d'authentification" #. (para) #: ../source/TortoiseGit_en.xml:11913 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" -msgstr "Quand vous vous authentifiez avec un serveur Subversion, le nom de l'utilisateur et le mot de passe sont mis en cache localement pour que vous n'ayez pas à les entrer à nouveau. Vous pouvez vouloir effacer cela pour des raisons de sécurité ou parce que voulez accédez au référentiel sous un autre nom d'utilisateur ... est-ce que John sait que vous utilisez son PC ?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgstr "Quand vous vous authentifiez avec un serveur Git, le nom de l'utilisateur et le mot de passe sont mis en cache localement pour que vous n'ayez pas à les entrer à nouveau. Vous pouvez vouloir effacer cela pour des raisons de sécurité ou parce que voulez accédez au référentiel sous un autre nom d'utilisateur ... est-ce que John sait que vous utilisez son PC ?" #. (para) #: ../source/TortoiseGit_en.xml:11920 @@ -10154,8 +10154,8 @@ msgstr "La boîte de dialogue Configuration, page Scripts hook" #. (para) #: ../source/TortoiseGit_en.xml:12154 #, fuzzy -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." -msgstr " Cette boîte de dialogue vous permet de définir les scripts hook qui seront exécutés automatiquement lors de certaines actions de Subversion." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgstr " Cette boîte de dialogue vous permet de définir les scripts hook qui seront exécutés automatiquement lors de certaines actions de Git." #. (para) #: ../source/TortoiseGit_en.xml:12164 @@ -10236,8 +10236,8 @@ msgstr "Pre-update" #. (para) #: ../source/TortoiseGit_en.xml:12228 -msgid "Called before the actual Subversion update begins." -msgstr "Appelé avant que la mise à jour Subversion ne commence." +msgid "Called before the actual Git update begins." +msgstr "Appelé avant que la mise à jour Git ne commence." #. (term) #. (term) @@ -10350,7 +10350,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12406 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." msgstr "" #. (para) @@ -10460,8 +10460,8 @@ msgstr "Quelques-uns des réglages rarement utilisées ne sont disponibles qu'en #. (para) #: ../source/TortoiseGit_en.xml:12533 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." -msgstr "Vous pouvez spécifier un emplacement différent pour le fichier de configuration Subversion en utilisant l'emplacement du registre HKCU\\Software\\TortoiseGit\\ConfigDir. Ceci affectera toutes les opérations de TortoiseGit." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgstr "Vous pouvez spécifier un emplacement différent pour le fichier de configuration Git en utilisant l'emplacement du registre HKCU\\Software\\TortoiseGit\\ConfigDir. Ceci affectera toutes les opérations de TortoiseGit." #. (term) #: ../source/TortoiseGit_en.xml:12542 @@ -10525,8 +10525,8 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:12623 -msgid "Subversion Working Folders" -msgstr "Dossiers de travail de Subversion" +msgid "Git Working Folders" +msgstr "Dossiers de travail de Git" #. (primary) #: ../source/TortoiseGit_en.xml:12625 @@ -10541,8 +10541,8 @@ msgstr "répertoire _svn" #. (para) #: ../source/TortoiseGit_en.xml:12630 #, fuzzy -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." -msgstr "VS.NET quand il es utilisé avec des projets web ne peut pas manipuler les répertoires .svn que Subversion utilise pour stocker son information interne. Ce n'est pas un bug de Subversion. Le bug se trouve dans VS.NET et les extensions frontpage qu'il utilise." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgstr "VS.NET quand il es utilisé avec des projets web ne peut pas manipuler les répertoires .svn que Git utilise pour stocker son information interne. Ce n'est pas un bug de Git. Le bug se trouve dans VS.NET et les extensions frontpage qu'il utilise." #. (para) #: ../source/TortoiseGit_en.xml:12637 @@ -10552,8 +10552,8 @@ msgstr "Notez que le bug a été corrigé à partir de VS2005." #. (para) #: ../source/TortoiseGit_en.xml:12641 #, fuzzy -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." -msgstr "À partir de la version 1.3.0 de Subversion et de TortoiseGit, vous pouvez définir la variable d'environnement SVN_ASP_DOT_NET_HACK. Si cette variable est définie, Subversion utilisera alors des dossiers _svn au lieu des dossiers .svn. Vous devez redémarrer votre shell pour que cette variable d'environnement entre en vigueur. Normalement cela revient à redémarrer votre PC. Pour que ce soit plus facile, vous pouvez maintenant faire cela depuis la page des réglages généraux en utilisant une simple case à cocher - référez-vous à ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgstr "À partir de la version 1.3.0 de Git et de TortoiseGit, vous pouvez définir la variable d'environnement SVN_ASP_DOT_NET_HACK. Si cette variable est définie, Git utilisera alors des dossiers _svn au lieu des dossiers .svn. Vous devez redémarrer votre shell pour que cette variable d'environnement entre en vigueur. Normalement cela revient à redémarrer votre PC. Pour que ce soit plus facile, vous pouvez maintenant faire cela depuis la page des réglages généraux en utilisant une simple case à cocher - référez-vous à ." #. (para) #: ../source/TortoiseGit_en.xml:12651 @@ -10609,8 +10609,8 @@ msgstr "Numéro de version dans les fichiers" #. (para) #: ../source/TortoiseGit_en.xml:12702 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." -msgstr "SubWCRev est un programme console Windows qui peut être utilisé pour lire le statut d'une copie de travail Subversion et exécuter facultativement la substitution de mots-clé dans un fichier modèle. C'est souvent utilisé comme une partie du processus de génération comme un moyen d'incorporer l'information de la copie de travail dans l'objet que vous générez. Typiquement cela pourrait être utilisé pour inclure le numéro de révision dans une boîte d'À propos." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgstr "SubWCRev est un programme console Windows qui peut être utilisé pour lire le statut d'une copie de travail Git et exécuter facultativement la substitution de mots-clé dans un fichier modèle. C'est souvent utilisé comme une partie du processus de génération comme un moyen d'incorporer l'information de la copie de travail dans l'objet que vous générez. Typiquement cela pourrait être utilisé pour inclure le numéro de révision dans une boîte d'À propos." #. (title) #: ../source/TortoiseGit_en.xml:12716 @@ -10619,8 +10619,8 @@ msgstr "La ligne de commande SubWCRev" #. (para) #: ../source/TortoiseGit_en.xml:12717 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." -msgstr "SubWCRev lit le statut Subversion de tous les fichiers d'une copie de travail, en excluant par défaut les externes. Il enregistre le plus haut numéro de révision livrée trouvé et la date de cette révision, Il enregistre aussi s'il y a des modifications locales dans la copie de travail, ou des révisions mélangées. Le numéro de révision, la plage de révisions mises à jour et le statut de modification sont affichés sur stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgstr "SubWCRev lit le statut Git de tous les fichiers d'une copie de travail, en excluant par défaut les externes. Il enregistre le plus haut numéro de révision livrée trouvé et la date de cette révision, Il enregistre aussi s'il y a des modifications locales dans la copie de travail, ou des révisions mélangées. Le numéro de révision, la plage de révisions mises à jour et le statut de modification sont affichés sur stdout." #. (para) #: ../source/TortoiseGit_en.xml:12725 @@ -11118,8 +11118,8 @@ msgstr "Le message renseigné au moment du verrouillage." #. (para) #: ../source/TortoiseGit_en.xml:13031 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " -msgstr "Si vous avec besoin d'accéder à l'information sur les révisions depuis d'autres programmes que Subversion, vous pouvez utiliser l'objet COM SubWCRev comme interface. L'objet à créer est SubWCRev.object, et les méthodes suivantes sont supportées : " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgstr "Si vous avec besoin d'accéder à l'information sur les révisions depuis d'autres programmes que Git, vous pouvez utiliser l'objet COM SubWCRev comme interface. L'objet à créer est SubWCRev.object, et les méthodes suivantes sont supportées : " #. (programlisting) #: ../source/TortoiseGit_en.xml:13149 @@ -11397,8 +11397,8 @@ msgstr "FAQ" #. (para) #: ../source/TortoiseGit_en.xml:13237 #, fuzzy -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "Parce que TortoiseGit est développé tout le temps, il est parfois difficile de garder la documentation complètement à jour. Nous maintenons une FAQ interactive en ligne qui contient une sélection des questions les plus souvent posées sur les mailing lists de TortoiseGit dev@TortoiseGit.tigris.org et users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "Parce que TortoiseGit est développé tout le temps, il est parfois difficile de garder la documentation complètement à jour. Nous maintenons une FAQ interactive en ligne qui contient une sélection des questions les plus souvent posées sur les mailing lists de TortoiseGit tortoisegit-dev@googlegroups.com et tortoisegit-users@googlegroups.com ." #. (para) #: ../source/TortoiseGit_en.xml:13249 @@ -11408,8 +11408,8 @@ msgstr "Nous maintenons aussi un users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." -msgstr "Le meilleur endroit pour poser une question à laquelle vous n'avez pas trouvé de réponse est l'une des listes de diffusion. users@TortoiseGit.tigris.org est celle à utiliser pour les questions relatives à TortoiseGit. Si vous voulez aider au développement de TortoiseGit, vous devriez alors participer aux débats sur dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." +msgstr "Le meilleur endroit pour poser une question à laquelle vous n'avez pas trouvé de réponse est l'une des listes de diffusion. tortoisegit-users@googlegroups.com est celle à utiliser pour les questions relatives à TortoiseGit. Si vous voulez aider au développement de TortoiseGit, vous devriez alors participer aux débats sur tortoisegit-dev@googlegroups.com ." #. (title) #: ../source/TortoiseGit_en.xml:13275 @@ -11469,8 +11469,8 @@ msgstr "message vide" #. (para) #: ../source/TortoiseGit_en.xml:13340 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." -msgstr "Il y a deux façons d'empêcher les utilisateurs de livrer avec un commentaire vide. L'une est spécifique à TortoiseGit, l'autre fonctionne pour tous les clients Subversion, mais exige l'accès au serveur directement." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." +msgstr "Il y a deux façons d'empêcher les utilisateurs de livrer avec un commentaire vide. L'une est spécifique à TortoiseGit, l'autre fonctionne pour tous les clients Git, mais exige l'accès au serveur directement." #. (title) #: ../source/TortoiseGit_en.xml:13346 @@ -11490,8 +11490,8 @@ msgstr "Dans le dossier du référentiel sur le serveur, il y a un sous-dossier #. (para) #: ../source/TortoiseGit_en.xml:13362 -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." -msgstr "Cette méthode est celle recommandée si vos utilisateurs utilisent aussi d'autres clients Subversion que TortoiseGit. L'inconvénient réside dans le fait que la livraison est rejetée par le serveur et donc les utilisateurs obtiendront un message d'erreur. Le client ne peut pas savoir avant la livraison qu'elle sera rejetée. Si vous voulez que TortoiseGit ait le bouton OK désactivé jusqu'à ce que le commentaire soit assez long alors veuillez utiliser la méthode décrite ci-dessous." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgstr "Cette méthode est celle recommandée si vos utilisateurs utilisent aussi d'autres clients Git que TortoiseGit. L'inconvénient réside dans le fait que la livraison est rejetée par le serveur et donc les utilisateurs obtiendront un message d'erreur. Le client ne peut pas savoir avant la livraison qu'elle sera rejetée. Si vous voulez que TortoiseGit ait le bouton OK désactivé jusqu'à ce que le commentaire soit assez long alors veuillez utiliser la méthode décrite ci-dessous." #. (title) #: ../source/TortoiseGit_en.xml:13373 @@ -11641,8 +11641,8 @@ msgstr "Puisque TortoiseGit ne perd jamais de données, vos révisions an #. (para) #: ../source/TortoiseGit_en.xml:13563 #, fuzzy -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." -msgstr "La seule façon de supprimer des données du référentiel est d'utiliser l'outil de ligne de commande de Subversion svnadmin. Vous pouvez trouver une description de son fonctionnement dans le Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgstr "La seule façon de supprimer des données du référentiel est d'utiliser l'outil de ligne de commande de Git svnadmin. Vous pouvez trouver une description de son fonctionnement dans le Repository Maintenance." #. (title) #: ../source/TortoiseGit_en.xml:13574 @@ -11708,8 +11708,8 @@ msgstr "Définissez la propriété svn:externals sur un dossi #. (para) #: ../source/TortoiseGit_en.xml:13657 #, fuzzy -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." -msgstr "Livrez le nouveau dossier. Maintenant quand vous mettrez à jour, Subversion récupérera une copie de ce projet de son référentiel vers votre copie de travail. Les sous-dossiers seront créés automatiquement au besoin. Chaque fois que vous mettrez à jour votre copie de travail principale, vous recevrez aussi la dernière version de tous les projets externes." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgstr "Livrez le nouveau dossier. Maintenant quand vous mettrez à jour, Git récupérera une copie de ce projet de son référentiel vers votre copie de travail. Les sous-dossiers seront créés automatiquement au besoin. Chaque fois que vous mettrez à jour votre copie de travail principale, vous recevrez aussi la dernière version de tous les projets externes." #. (para) #: ../source/TortoiseGit_en.xml:13676 @@ -11723,8 +11723,8 @@ msgstr "Utiliser une copie de travail nichée" #. (para) #: ../source/TortoiseGit_en.xml:13685 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" -msgstr "Créez un nouveau dossier dans votre projet pour contenir le code commun, mais ne l'ajoutez pas à Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" +msgstr "Créez un nouveau dossier dans votre projet pour contenir le code commun, mais ne l'ajoutez pas à Git" #. (para) #: ../source/TortoiseGit_en.xml:13689 @@ -12308,8 +12308,8 @@ msgstr "Puisque toutes les commandes pour TortoiseGit sont contrôlées par des #. (para) #: ../source/TortoiseGit_en.xml:14192 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." -msgstr "Souvenez-vous que TortoiseGit est un client GUI et ce guide d'automatisation vous montre comment faire les boîtes de dialogues de TortoiseGit apparaissent pour collecter les entrées utilisateur. Si vous voulez écrire un script qui n'exige aucune entrée, vous devriez utiliser le client en ligne de commande Subversion officiel à la place." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." +msgstr "Souvenez-vous que TortoiseGit est un client GUI et ce guide d'automatisation vous montre comment faire les boîtes de dialogues de TortoiseGit apparaissent pour collecter les entrées utilisateur. Si vous voulez écrire un script qui n'exige aucune entrée, vous devriez utiliser le client en ligne de commande Git officiel à la place." #. (title) #. (title) @@ -12929,18 +12929,18 @@ msgstr "ILC" #. (para) #: ../source/TortoiseGit_en.xml:14786 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." -msgstr "Parfois ce manuel se réfère à la documentation principale de Subversion, qui décrit Subversion en termes d'Interface de Ligne de Commande (ILC). Pour vous aider à comprendre ce que fait TortoiseGit en coulisses, nous avons compilé une liste montrant les commandes ILC équivalentes pour chacune des opérations GUI de TortoiseGit." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgstr "Parfois ce manuel se réfère à la documentation principale de Git, qui décrit Git en termes d'Interface de Ligne de Commande (ILC). Pour vous aider à comprendre ce que fait TortoiseGit en coulisses, nous avons compilé une liste montrant les commandes ILC équivalentes pour chacune des opérations GUI de TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:14795 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." -msgstr "Bien qu'il y ait des équivalents ILC à ce que fait TortoiseGit, souvenez-vous que TortoiseGit ne fait pas appel à l'ILC mais utilise la bibliothèque de Subversion directement." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." +msgstr "Bien qu'il y ait des équivalents ILC à ce que fait TortoiseGit, souvenez-vous que TortoiseGit ne fait pas appel à l'ILC mais utilise la bibliothèque de Git directement." #. (para) #: ../source/TortoiseGit_en.xml:14801 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." -msgstr "Si vous pensez avoir trouvé un bug dans TortoiseGit, nous pouvons vous demander d'essayer de le reproduire en utilisant l'ILC, pour que nous puissions distinguer les problèmes de TortoiseGit des problèmes de Subversion. Cette référence vous dit quelle commande essayer." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." +msgstr "Si vous pensez avoir trouvé un bug dans TortoiseGit, nous pouvons vous demander d'essayer de le reproduire en utilisant l'ILC, pour que nous puissions distinguer les problèmes de TortoiseGit des problèmes de Git. Cette référence vous dit quelle commande essayer." #. (title) #: ../source/TortoiseGit_en.xml:14809 @@ -13003,8 +13003,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14859 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." -msgstr "Mettre à jour plusieurs éléments n'est pas actuellement une opération atomique dans Subversion. Donc TortoiseGit trouve d'abord la révision HEAD du référentiel et met ensuite à jour tous les éléments à ce numéro de révision particulier pour éviter de créer une copie de travail avec des révisions mélangées." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgstr "Mettre à jour plusieurs éléments n'est pas actuellement une opération atomique dans Git. Donc TortoiseGit trouve d'abord la révision HEAD du référentiel et met ensuite à jour tous les éléments à ce numéro de révision particulier pour éviter de créer une copie de travail avec des révisions mélangées." #. (para) #: ../source/TortoiseGit_en.xml:14866 @@ -13040,8 +13040,8 @@ msgstr "Si Mettre à jour seulement le répertoire de tête #. (para) #: ../source/TortoiseGit_en.xml:14894 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." -msgstr "Dans TortoiseGit, la boîte de dialogue livrer utilise plusieurs commandes Subversion. La première étape est une vérification de statut qui détermine les éléments de votre copie de travail qui peuvent potentiellement être livrés. Vous pouvez passer en revue la liste, comparer les fichiers avec la BASE et les éléments que vous voulez inclure dans la livraison." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgstr "Dans TortoiseGit, la boîte de dialogue livrer utilise plusieurs commandes Git. La première étape est une vérification de statut qui détermine les éléments de votre copie de travail qui peuvent potentiellement être livrés. Vous pouvez passer en revue la liste, comparer les fichiers avec la BASE et les éléments que vous voulez inclure dans la livraison." #. (screen) #. (screen) @@ -13061,8 +13061,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14904 #: ../source/TortoiseGit_en.xml:14992 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." -msgstr "Si Afficher les fichiers non versionnés est coché, TortoiseGit affichera aussi tous les fichiers et tous les dossiers non versionnés dans la hiérarchie de la copie de travail, en prenant en compte les règles d'exclusion. Cette fonctionnalité particulière n'a aucun équivalent direct dans Subversion, puisque la commande svn status ne parcourt pas les dossiers non versionnés." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." +msgstr "Si Afficher les fichiers non versionnés est coché, TortoiseGit affichera aussi tous les fichiers et tous les dossiers non versionnés dans la hiérarchie de la copie de travail, en prenant en compte les règles d'exclusion. Cette fonctionnalité particulière n'a aucun équivalent direct dans Git, puisque la commande svn status ne parcourt pas les dossiers non versionnés." #. (para) #: ../source/TortoiseGit_en.xml:14912 @@ -13083,8 +13083,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14919 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." -msgstr "Quand vous cliquez sur OK, la livraison Subversion se produit. Si vous avez laissé toutes les cases de sélection de fichier dans leur état par défaut, TortoiseGit utilise une seule livraison récursive de la copie de travail. Si vous désélectionnez quelques fichiers, alors une livraison non récursive (-N) doit être utilisée et chaque chemin doit être spécifié individuellement sur la ligne de commande de livraison." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgstr "Quand vous cliquez sur OK, la livraison Git se produit. Si vous avez laissé toutes les cases de sélection de fichier dans leur état par défaut, TortoiseGit utilise une seule livraison récursive de la copie de travail. Si vous désélectionnez quelques fichiers, alors une livraison non récursive (-N) doit être utilisée et chaque chemin doit être spécifié individuellement sur la ligne de commande de livraison." #. (screen) #: ../source/TortoiseGit_en.xml:14927 @@ -13270,8 +13270,8 @@ msgstr "La première étape est un contrôle de statut qui détermine les élém #. (para) #: ../source/TortoiseGit_en.xml:15072 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." -msgstr "Quand vous cliquez sur OK, le retour en arrière de Subversion se produit. Si vous avez laissé toutes les cases de sélection de fichier dans leur état par défaut, TortoiseGit utilise un seul retour en arrière récursif (-R) de la copie de travail. Si vous désélectionnez quelques fichiers, alors chaque chemin doit être spécifié individuellement sur la ligne de commande de retour en arrière." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgstr "Quand vous cliquez sur OK, le retour en arrière de Git se produit. Si vous avez laissé toutes les cases de sélection de fichier dans leur état par défaut, TortoiseGit utilise un seul retour en arrière récursif (-R) de la copie de travail. Si vous désélectionnez quelques fichiers, alors chaque chemin doit être spécifié individuellement sur la ligne de commande de retour en arrière." #. (screen) #: ../source/TortoiseGit_en.xml:15079 @@ -13425,8 +13425,8 @@ msgstr "Cette forme est utilisée lors d'un accès depuis un dossier non version #. (para) #: ../source/TortoiseGit_en.xml:15174 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." -msgstr "L'exportation d'une copie de travail dans un emplacement différent est fait sans utiliser la bibliothèque de Subversion, donc il n'existe aucun équivalent en ligne de commande correspondant." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." +msgstr "L'exportation d'une copie de travail dans un emplacement différent est fait sans utiliser la bibliothèque de Git, donc il n'existe aucun équivalent en ligne de commande correspondant." #. (para) #: ../source/TortoiseGit_en.xml:15179 @@ -13536,8 +13536,8 @@ msgstr "TortoiseGit crée un patch dans le format de différences unifiées en c #. (para) #: ../source/TortoiseGit_en.xml:15260 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." -msgstr "Appliquer un patch est une activité difficile à moins que le patch et la copie de travail ne soient à la même révision. Heureusement pour vous, vous pouvez utiliser TortoiseMerge, qui n'a aucun équivalent direct dans Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." +msgstr "Appliquer un patch est une activité difficile à moins que le patch et la copie de travail ne soient à la même révision. Heureusement pour vous, vous pouvez utiliser TortoiseMerge, qui n'a aucun équivalent direct dans Git." #. (title) #: ../source/TortoiseGit_en.xml:15274 @@ -13556,7 +13556,7 @@ msgstr "priorité des recouvements" #. (para) #: ../source/TortoiseGit_en.xml:15289 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." msgstr "" #. (para) @@ -13581,13 +13581,13 @@ msgstr " L'overlay indique juste q #. (para) #: ../source/TortoiseGit_en.xml:15331 -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." -msgstr " L'icone de recouvrement Dans Subversion est utilisé pour représenter un élément qui est dans un état normal, ou un élément sous contrôle de version dont l'état n'est pas encore connu. TortoiseGit fonctionne avec un système de mise en cache en arrière plan pour récupérer les états, les mises à jours des icones de recouvrement peuvent donc prendre quelques secondes." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgstr " L'icone de recouvrement Dans Git est utilisé pour représenter un élément qui est dans un état normal, ou un élément sous contrôle de version dont l'état n'est pas encore connu. TortoiseGit fonctionne avec un système de mise en cache en arrière plan pour récupérer les états, les mises à jours des icones de recouvrement peuvent donc prendre quelques secondes." #. (para) #: ../source/TortoiseGit_en.xml:15340 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." -msgstr " L'icone de recouvrement A Besoin d'être Verrouilé est utilisé pour indiquer que la propriété svn:needs-lock est activée pour un fichier. Pour les copies de travail créées avec les versions 1.4.0 et ultérieures de Subversion, l'état de la propriété svn:needs-lock est mis en cache localement par Subversion et cette valeur est utilisée pour activer ou non l'icone de recouvrement. Pour les copies de travail créées avec des versions antérieures, TortoiseGit utilise cette icone lorsque le fichier est en lecture seule. Notez que Subversion met à jour automatiquement le format des copies de travail lorsque vous faites une mise à jour, de ce fait la mise en cache de l'état de la propriété svn:needs-lock ne devrait pas se produite à moins que le fichier lui même ne soit pas à jour." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgstr " L'icone de recouvrement A Besoin d'être Verrouilé est utilisé pour indiquer que la propriété svn:needs-lock est activée pour un fichier. Pour les copies de travail créées avec les versions 1.4.0 et ultérieures de Git, l'état de la propriété svn:needs-lock est mis en cache localement par Git et cette valeur est utilisée pour activer ou non l'icone de recouvrement. Pour les copies de travail créées avec des versions antérieures, TortoiseGit utilise cette icone lorsque le fichier est en lecture seule. Notez que Git met à jour automatiquement le format des copies de travail lorsque vous faites une mise à jour, de ce fait la mise en cache de l'état de la propriété svn:needs-lock ne devrait pas se produite à moins que le fichier lui même ne soit pas à jour." #. (para) #: ../source/TortoiseGit_en.xml:15354 @@ -13606,12 +13606,12 @@ msgstr " L'icône de recouvreme #. (para) #: ../source/TortoiseGit_en.xml:15375 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15382 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "" #. (para) @@ -13656,22 +13656,22 @@ msgstr "Sécuriser Svnserve grâce à SSH" #. (para) #: ../source/TortoiseGit_en.xml:15452 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15462 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15467 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15473 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" msgstr "" #. (title) @@ -13689,7 +13689,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15494 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." msgstr "" #. (para) @@ -13825,7 +13825,7 @@ msgstr "Tester SSH avec TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:15657 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "" #. (para) @@ -13934,8 +13934,8 @@ msgstr "Glossaire" #. (para) #: ../source/TortoiseGit_en.xml:15809 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Une commande Subversion utilisée pour ajouter un fichier ou un répertoire à votre copie de travail. Les nouveaux éléments sont ajoutés au référentiel à la livraison." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Une commande Git utilisée pour ajouter un fichier ou un répertoire à votre copie de travail. Les nouveaux éléments sont ajoutés au référentiel à la livraison." #. (glossterm) #: ../source/TortoiseGit_en.xml:15817 @@ -13969,23 +13969,23 @@ msgstr "Branche" #. (para) #: ../source/TortoiseGit_en.xml:15851 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Un terme fréquemment utilisé dans les système de contrôle de révisions pour décrire ce qu'il se passe quand le développement se scinde à un point particulier et suit 2 chemins séparés. Vous pouvez créer une branche en dehors de la ligne de développement principale pour développer une nouvelle fonctionnalité sans rendre la ligne principale instable. Ou vous pouvez faire une branche avec une version stable sur laquelle vous ne ferez que des corrections de bugs, tandis que les nouveaux développements seront faits sur la branche instable. Dans Subversion, une branche est implémentée comme une copie bon marché." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Un terme fréquemment utilisé dans les système de contrôle de révisions pour décrire ce qu'il se passe quand le développement se scinde à un point particulier et suit 2 chemins séparés. Vous pouvez créer une branche en dehors de la ligne de développement principale pour développer une nouvelle fonctionnalité sans rendre la ligne principale instable. Ou vous pouvez faire une branche avec une version stable sur laquelle vous ne ferez que des corrections de bugs, tandis que les nouveaux développements seront faits sur la branche instable. Dans Git, une branche est implémentée comme une copie bon marché." #. (para) #: ../source/TortoiseGit_en.xml:15866 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Une commande Subversion qui crée une copie de travail locale dans un répertoire vide en téléchargeant les fichiers versionnés depuis le référentiel." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Une commande Git qui crée une copie de travail locale dans un répertoire vide en téléchargeant les fichiers versionnés depuis le référentiel." #. (para) #: ../source/TortoiseGit_en.xml:15875 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Pour citer le manuel Subversion : Nettoie récursivement la copie de travail, en supprimant les verrous et en reprenant les opérations non terminées. Si vous obtenez une erreur copie de travail verrouillée, exécutez cette commande pour supprimer les verrous périmés et rendre votre copie de travail utilisable à nouveau. Notez que dans ce contexte, les verrous font référence aux verrouillages du système de fichiers local et non au verrouillage du référentiel." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Pour citer le manuel Git : Nettoie récursivement la copie de travail, en supprimant les verrous et en reprenant les opérations non terminées. Si vous obtenez une erreur copie de travail verrouillée, exécutez cette commande pour supprimer les verrous périmés et rendre votre copie de travail utilisable à nouveau. Notez que dans ce contexte, les verrous font référence aux verrouillages du système de fichiers local et non au verrouillage du référentiel." #. (para) #: ../source/TortoiseGit_en.xml:15892 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Cette commande Subversion est utilisée pour renvoyer les changements de votre copie de travail locale au référentiel, en créant une nouvelle révision du référentiel." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Cette commande Git est utilisée pour renvoyer les changements de votre copie de travail locale au référentiel, en créant une nouvelle révision du référentiel." #. (glossterm) #: ../source/TortoiseGit_en.xml:15900 @@ -13994,8 +13994,8 @@ msgstr "Conflit" #. (para) #: ../source/TortoiseGit_en.xml:15902 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Quand les changements du référentiel sont fusionnés avec les changements locaux, ces changements se produisent parfois sur les mêmes lignes. Dans ce cas, Subversion ne peut pas décider automatiquement quelle version utilisée et le fichier est dit en conflit. Vous devez éditer le fichier manuellement et résoudre le conflit avant de pouvoir livrer d'autres modifications." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Quand les changements du référentiel sont fusionnés avec les changements locaux, ces changements se produisent parfois sur les mêmes lignes. Dans ce cas, Git ne peut pas décider automatiquement quelle version utilisée et le fichier est dit en conflit. Vous devez éditer le fichier manuellement et résoudre le conflit avant de pouvoir livrer d'autres modifications." #. (glossterm) #: ../source/TortoiseGit_en.xml:15912 @@ -14004,8 +14004,8 @@ msgstr "Copier" #. (para) #: ../source/TortoiseGit_en.xml:15914 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "Dans un référentiel Subversion, vous pouvez créer une copie d'un unique fichier ou de toute une arborescence. Celles-ci sont implémentées comme des copies bon marché qui fonctionnent comme des liens vers l'original dans le sens où elles ne prennent quasiment pas de place. Faire une copie préserve l'historique de l'élément dans la copie, donc vous pouvez suivre les changements effectués avant que la copie n'ait été faite. " +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "Dans un référentiel Git, vous pouvez créer une copie d'un unique fichier ou de toute une arborescence. Celles-ci sont implémentées comme des copies bon marché qui fonctionnent comme des liens vers l'original dans le sens où elles ne prennent quasiment pas de place. Faire une copie préserve l'historique de l'élément dans la copie, donc vous pouvez suivre les changements effectués avant que la copie n'ait été faite. " #. (para) #: ../source/TortoiseGit_en.xml:15926 @@ -14029,8 +14029,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15957 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Un système de gestion de fichier de Subversion pour référentiels. Peut être utilisé pour les partages réseaux. Utilisé par défaut pour les référentiels à partir de la version 1.2." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Un système de gestion de fichier de Git pour référentiels. Peut être utilisé pour les partages réseaux. Utilisé par défaut pour les référentiels à partir de la version 1.2." #. (para) #: ../source/TortoiseGit_en.xml:15966 @@ -14049,8 +14049,8 @@ msgstr "La dernière révision d'un fichier ou d'un répertoire dans le Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Si la copie de travail n'a que des modifications sur des fichiers texte, il est possible d'utiliser la commande Subversion Voir les différences pour générer un unique fichier résumant ces changements dans le format de différences unifiées. Un fichier de ce type est souvent connu comme un Patch et il peut envoyé par email à quelqu'un d'autre (ou à une mailing list) et appliqué à une autre copie de travail. Une personne sans un accès pour livrer peut effectuer ces changements et soumettre un fichier patch à une personne autorisée à livrer pour qu'elle l'applique. Ou si vous n'êtes pas sûr d'un changement, vous pouvez soumettre un patch aux autres pour qu'ils l'examinent." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Si la copie de travail n'a que des modifications sur des fichiers texte, il est possible d'utiliser la commande Git Voir les différences pour générer un unique fichier résumant ces changements dans le format de différences unifiées. Un fichier de ce type est souvent connu comme un Patch et il peut envoyé par email à quelqu'un d'autre (ou à une mailing list) et appliqué à une autre copie de travail. Une personne sans un accès pour livrer peut effectuer ces changements et soumettre un fichier patch à une personne autorisée à livrer pour qu'elle l'applique. Ou si vous n'êtes pas sûr d'un changement, vous pouvez soumettre un patch aux autres pour qu'ils l'examinent." #. (glossterm) #: ../source/TortoiseGit_en.xml:16048 @@ -14104,8 +14104,8 @@ msgstr "Propriété" #. (para) #: ../source/TortoiseGit_en.xml:16050 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "En plus de versionner vos répertoires et vos fichiers, Subversion vous permet d'ajouter des métadonnées versionnées - connues comme des propriétés - à chacun de vos fichiers et répertoires versionnés. Chaque propriété possède un nom et une valeur, plutôt qu'une clé de régistre. Subversion dispose de quelques propriétés spéciales qu'il utilise en interne, comme svn:eol-style. TortoiseGit en a aussi, tel que tsvn:logminsize. Vous pouvez ajouter vos propres propriétés avec des noms et des valeurs de votre choix." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "En plus de versionner vos répertoires et vos fichiers, Git vous permet d'ajouter des métadonnées versionnées - connues comme des propriétés - à chacun de vos fichiers et répertoires versionnés. Chaque propriété possède un nom et une valeur, plutôt qu'une clé de régistre. Git dispose de quelques propriétés spéciales qu'il utilise en interne, comme svn:eol-style. TortoiseGit en a aussi, tel que tsvn:logminsize. Vous pouvez ajouter vos propres propriétés avec des noms et des valeurs de votre choix." #. (para) #: ../source/TortoiseGit_en.xml:16065 @@ -14134,8 +14134,8 @@ msgstr "Quand les fichiers d'une copie de travail sont laissés dans un état co #. (para) #: ../source/TortoiseGit_en.xml:16105 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion conserve une copie primitive locale de chaque fichier tel qu'il était lors de la dernière mise à jour de votre copie de travail. Si vous avez des changements et que vous décidez de les annuler, vous pouvez utiliser la commande Revenir en arrière pour revenir à la copie primitive." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git conserve une copie primitive locale de chaque fichier tel qu'il était lors de la dernière mise à jour de votre copie de travail. Si vous avez des changements et que vous décidez de les annuler, vous pouvez utiliser la commande Revenir en arrière pour revenir à la copie primitive." #. (glossterm) #: ../source/TortoiseGit_en.xml:16114 @@ -14169,13 +14169,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:16146 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Une abbréviation pour Subversion fréquemment utilisée." +msgid "A frequently-used abbreviation for Git." +msgstr "Une abbréviation pour Git fréquemment utilisée." #. (para) #: ../source/TortoiseGit_en.xml:16149 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Le nom du protocole personnalisé de Subversion utilisé par le serveur de référentiel svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Le nom du protocole personnalisé de Git utilisé par le serveur de référentiel svnserve." #. (para) #: ../source/TortoiseGit_en.xml:16158 @@ -14184,8 +14184,8 @@ msgstr "De même que Mettre à jour à la révision change la fen #. (para) #: ../source/TortoiseGit_en.xml:16172 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Cette commande Subversion récupère les derniers changements depuis le référentiel vers votre copie de travail, en fusionnant les modifications faites par d'autres avec les modifications locales dans la copie de travail." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Cette commande Git récupère les derniers changements depuis le référentiel vers votre copie de travail, en fusionnant les modifications faites par d'autres avec les modifications locales dans la copie de travail." #. (glossterm) #: ../source/TortoiseGit_en.xml:16180 @@ -14216,7 +14216,7 @@ msgstr "traduction" #~ "Fred.c but not subdir/Fred.c. This " #~ "is significant if you add a folder which contains some files that you " #~ "want to be ignored, because those filenames will be preceded with the " -#~ "folder name when Subversion compares them with the ignore pattern." +#~ "folder name when Git compares them with the ignore pattern." #~ msgstr "" #~ "Si les noms de répertoire sont présents dans un chemin, ils sont inclus " #~ "dans la correspondance, donc le modèle Fred.* " @@ -14490,14 +14490,14 @@ msgstr "traduction" #~ "filename>. Windows traite de tels fichiers d'une façon spéciale mais ce " #~ "n'est vraiment qu'un fichier texte !" #~ msgid "" -#~ "Get the latest version of Subversion from http://" -#~ "subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." #~ msgstr "" -#~ "Récupérez la dernière version de Subversion à partir de http://subversion.tigris.org/servlets/ProjectDocumentList?" +#~ "Récupérez la dernière version de Git à partir de http://Git.tigris.org/servlets/ProjectDocumentList?" #~ "folderID=91." #~ msgid "" #~ "It is beyond the scope of this documentation to detail the installation " @@ -14513,29 +14513,29 @@ msgstr "traduction" #~ msgid "Cyrus SASL Support" #~ msgstr "Support de Cyrus SASL" #~ msgid "" -#~ "Starting with Subversion 1.5.0, svnserve and TortoiseGit support Cyrus " +#~ "Starting with Git 1.5.0, svnserve and TortoiseGit support Cyrus " #~ "SASL (Simple Authentication and Security Layer) for the svn:// protocol. You can find further information in this subversion " +#~ "filename> protocol. You can find further information in this Git " #~ "app note: Using Cyrus SASL Authentication with SubversionUsing Cyrus SASL Authentication with Git." #~ msgstr "" -#~ "Starting with Subversion 1.5.0, svnserve and TortoiseGit support Cyrus " +#~ "Starting with Git 1.5.0, svnserve and TortoiseGit support Cyrus " #~ "SASL (Simple Authentication and Security Layer) for the svn:// protocol. You can find further information in this subversion " +#~ "filename> protocol. You can find further information in this Git " #~ "app note: Using Cyrus SASL Authentication with SubversionUsing Cyrus SASL Authentication with Git." #, fuzzy #~ msgid "" #~ "If you really need to access a repository through a network share, create " #~ "the repository with FSFS format. If you need to provide server access as " -#~ "well, you will need Subversion Server 1.1 or higher." +#~ "well, you will need Git Server 1.1 or higher." #~ msgstr "" #~ "Si vous devez vraiment avoir accès à un référentiel par un partage " #~ "réseau, créez le référentiel avec le format fsfs. Si vous devez fournir " -#~ "l'accès serveur aussi, vous aurez besoin du serveur de Subversion 1.1 ou " +#~ "l'accès serveur aussi, vous aurez besoin du serveur de Git 1.1 ou " #~ "supérieur." #, fuzzy @@ -14567,23 +14567,23 @@ msgstr "traduction" #~ "Dans cette boîte de dialogue vous devez entrer l'URL du référentiel dans " #~ "lequel vous voulez importer votre projet." #~ msgid "" -#~ "The Subversion import command has limited functionality - you cannot " +#~ "The Git import command has limited functionality - you cannot " #~ "easily pick items for import. Also, the folder you are importing does not " -#~ "become a Subversion working copy - you have to do a separate checkout. " +#~ "become a Git working copy - you have to do a separate checkout. " #~ "But don't worry, there is another way of working which overcomes both " #~ "these shortcomings :-)" #~ msgstr "" -#~ "La commande import de Subversion est une fonctionnalité limitée - on ne " +#~ "La commande import de Git est une fonctionnalité limitée - on ne " #~ "peux pas facilement sélectionner précisément quels éléments importer. De " #~ "même, le répertoire que vous importez ne devient pas une copie de travail " -#~ "pour Subversion - pour ce faire vous devez faire une extraction. Mais ne " +#~ "pour Git - pour ce faire vous devez faire une extraction. Mais ne " #~ "vous inquiétez pas, il existe un autre moyen de travailler qui permet " #~ "d'éviter ces désagréments :-)" #, fuzzy #~ msgid "" #~ "Note that if you change the URL in an svn:externals " -#~ "property, then next time you update your working copy Subversion will " +#~ "property, then next time you update your working copy Git will " #~ "delete the old external folder and make a fresh checkout, so you will see " #~ "files being Added, rather than being " #~ "Updated as you might have expected. This situation " @@ -14593,7 +14593,7 @@ msgstr "traduction" #~ msgstr "" #~ "Notez que si vous changez l'URL dans la propriété svn:externals, alors la prochaine fois vous mettez à jour votre copie de " -#~ "travail Subversion supprimera le vieux dossier externe et fera une " +#~ "travail Git supprimera le vieux dossier externe et fera une " #~ "nouvelle extraction, donc vous verrez des fichiers être Ajoutés, au lieu d'être Mis à jour comme vous " #~ "pourriez vous y attendre. Cette situation pourrait arriver si vous faites " @@ -14622,7 +14622,7 @@ msgstr "traduction" #~ msgid "" #~ "When you checkout an existing source tree from the repository, you should " #~ "do so in an empty directory. If you try to check out your source tree " -#~ "into the same directory that you imported from, Subversion will throw an " +#~ "into the same directory that you imported from, Git will throw an " #~ "error message because it will not overwrite the existing unversioned " #~ "files with versioned ones, even if they are identical. You will have to " #~ "check out into a different directory or delete the existing source tree " @@ -14631,7 +14631,7 @@ msgstr "traduction" #~ msgstr "" #~ "Vous devriez seulement extraire dans un répertoire vide. Si vous voulez " #~ "extraire votre arborescence source dans le même répertoire que vous avez " -#~ "importé, Subversion affichera un message d'erreur parce qu'il ne " +#~ "importé, Git affichera un message d'erreur parce qu'il ne " #~ "remplacera pas les fichiers non versionnés existants par les fichiers " #~ "versionnés. Vous devrez extraire dans un répertoire différent ou " #~ "supprimer l'arborescence source existante d'abord." @@ -14685,7 +14685,7 @@ msgstr "traduction" #~ msgid "" #~ "In the From Revision field enter the start revision " #~ "number. This is the revision before the changes you " -#~ "want to merge. Remember that Subversion will create a diff file in order " +#~ "want to merge. Remember that Git will create a diff file in order " #~ "to perform the merge, so the start point has to be just before the first " #~ "change you are interested in. For example, your log messages may look " #~ "something like this: \n" @@ -14707,7 +14707,7 @@ msgstr "traduction" #~ msgstr "" #~ "Dans le champ Depuis la révision entrez le numéro de " #~ "la révision de départ. C'est la révision avant les " -#~ "changements que vous voulez fusionner. Souvenez-vous que Subversion " +#~ "changements que vous voulez fusionner. Souvenez-vous que Git " #~ "créera un fichier de différence pour exécuter la fusion, donc le point de " #~ "départ doit être juste avant le premier changement qui vous intéresse. " #~ "Par exemple, vos commentaires peuvent ressembler à quelque chose comme " diff --git a/doc/po/TortoiseSVN_id.po b/doc/po/TortoiseSVN_id.po index d73737f..a5c6df4 100644 --- a/doc/po/TortoiseSVN_id.po +++ b/doc/po/TortoiseSVN_id.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2008-12-21 00:08 +0000\n" "PO-Revision-Date: 2009-01-01 22:29+0700\n" "Last-Translator: Thomas Edwin Santosa \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -43,8 +43,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Klien Subversion untuk Windows" +msgid "A Git client for Windows" +msgstr "Klien Git untuk Windows" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -129,8 +129,8 @@ msgstr "Audien" # Indonesian#: source/TortoiseGit_en.xml:75(para) #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "Buku ini ditulis untuk orang melek komputer yang ingin menggunakan Subversion untuk mengatur datanya, tapi tidak senang menggunakan klien baris perintah untuk melakukannya. Karena TortoiseGit adalah ekstensi shell windows ia menganggap pengguna itu sudah terbiasa dengan windows explorer dan tahu bagaimana menggunakannya." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "Buku ini ditulis untuk orang melek komputer yang ingin menggunakan Git untuk mengatur datanya, tapi tidak senang menggunakan klien baris perintah untuk melakukannya. Karena TortoiseGit adalah ekstensi shell windows ia menganggap pengguna itu sudah terbiasa dengan windows explorer dan tahu bagaimana menggunakannya." # Indonesian#: source/TortoiseGit_en.xml:88(title) #. (title) @@ -153,20 +153,20 @@ msgstr "The menjelaskan apa sebenarnya Tor # Indonesian#: source/TortoiseGit_en.xml:99(para) #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." -msgstr "Dalam kami memberikan pengenalan ringkas pada sistem kontrol versi Subversion yang mendasari TortoiseGit. Ini dipinjam dari dokumentasi untuk proyek Subversion dan menjelaskan pendekatan-pendekatan berbeda terhadap kontrol versi, dan bagaimana Subversion bekerja." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." +msgstr "Dalam kami memberikan pengenalan ringkas pada sistem kontrol versi Git yang mendasari TortoiseGit. Ini dipinjam dari dokumentasi untuk proyek Git dan menjelaskan pendekatan-pendekatan berbeda terhadap kontrol versi, dan bagaimana Git bekerja." # Indonesian#: source/TortoiseGit_en.xml:106(para) #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." -msgstr "Meskipun banyak pengguna Subversion tidak akan pernah harus menyiapkan server sendiri. Bab berikutnya berkenaan dengan bagaimana menyiapkan server itu, dan berguna bagi administrator." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgstr "Meskipun banyak pengguna Git tidak akan pernah harus menyiapkan server sendiri. Bab berikutnya berkenaan dengan bagaimana menyiapkan server itu, dan berguna bagi administrator." # Indonesian#: source/TortoiseGit_en.xml:111(para) #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr "Bab menjelaskan bagaimana menyiapkan repositori lokal, yang berguna untuk menguji Subversion dan TortoiseGit menggunakan PC tunggal. Ini juga menjelaskan sedikit tentang administrasi repositori yang juga relevan untuk repositori yang ditempatkan pada server." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr "Bab menjelaskan bagaimana menyiapkan repositori lokal, yang berguna untuk menguji Git dan TortoiseGit menggunakan PC tunggal. Ini juga menjelaskan sedikit tentang administrasi repositori yang juga relevan untuk repositori yang ditempatkan pada server." # Indonesian#: source/TortoiseGit_en.xml:117(para) #. (para) @@ -197,8 +197,8 @@ msgstr "Seksi Mengotomasi TortoiseGit memperlihatkan kepada #. (para) #: ../source/TortoiseGit_en.xml:134 #, fuzzy -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." -msgstr "Referensi Silang Baris Perintah memberikan korelasi antara perintah TortoiseGit dan persamaannya dalam klien baris perintah Subversion svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." +msgstr "Referensi Silang Baris Perintah memberikan korelasi antara perintah TortoiseGit dan persamaannya dalam klien baris perintah Git svn.exe." # Indonesian#: source/TortoiseGit_en.xml:149(title) #. (title) @@ -228,8 +228,8 @@ msgstr "Komunitas" # Indonesian#: source/TortoiseGit_en.xml:173(para) #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "TortoiseGit dan Subversion dikembangkan oleh komunitas orang yang bekerja pada proyek itu. Mereka datang dari berbagai negara di seluruh dunia dan bergabung bersama untuk membuat program yang baik." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "TortoiseGit dan Git dikembangkan oleh komunitas orang yang bekerja pada proyek itu. Mereka datang dari berbagai negara di seluruh dunia dan bergabung bersama untuk membuat program yang baik." # Indonesian#: source/TortoiseGit_en.xml:183(title) #. (title) @@ -287,14 +287,14 @@ msgstr "untuk menolong dokumentasi dan pemburuan bug" # Indonesian#: source/TortoiseGit_en.xml:211(term) source/TortoiseGit_en.xml:731(primary) #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "Buku Subversion" +msgid "The Git Book" +msgstr "Buku Git" # Indonesian#: source/TortoiseGit_en.xml:213(para) #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "untuk pengenalan yang baik pada Subversion dan bab 2 yang kami salin ke sini" +msgid "for the great introduction to Git and its chapter 2 which we copied here" +msgstr "untuk pengenalan yang baik pada Git dan bab 2 yang kami salin ke sini" # Indonesian#: source/TortoiseGit_en.xml:220(term) #. (term) @@ -430,14 +430,14 @@ msgstr "Apa itu TortoiseGit?" # Indonesian#: source/TortoiseGit_en.xml:338(para) #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." -msgstr "TortoiseGit adalah klien sumber-terbuka bebas untuk sistem kontrol versi Subversion. Yaitu, TortoiseGit mengatur file dan direktori terus menerus. File disimpan dalam pusat repositori. Repositori lebih mirip dengan server file biasa, kecuali ia mengingat setiap perubahan yang telah dibuat pada file dan direktori Anda. Ini mengijinkan Anda untuk menemukan kembali versi lebih lama, dan siapa yang mengubahnya. Inilah mengapa banyak orang berpikir bahwa Subversion dan sistem kontrol versi secara umum seperti mesin waktu." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." +msgstr "TortoiseGit adalah klien sumber-terbuka bebas untuk sistem kontrol versi Git. Yaitu, TortoiseGit mengatur file dan direktori terus menerus. File disimpan dalam pusat repositori. Repositori lebih mirip dengan server file biasa, kecuali ia mengingat setiap perubahan yang telah dibuat pada file dan direktori Anda. Ini mengijinkan Anda untuk menemukan kembali versi lebih lama, dan siapa yang mengubahnya. Inilah mengapa banyak orang berpikir bahwa Git dan sistem kontrol versi secara umum seperti mesin waktu." # Indonesian#: source/TortoiseGit_en.xml:349(para) #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." -msgstr "Beberapa sistem kontrol versi juga merupakan sistem manajemen konfigurasi perangkat lunak (SCM). Sistem ini terutama dibuat untuk mengatur susunan dari kode sumber, dan mempunyai banyak fitur yang khusus ke pengembangan perangkat lunak - seperti pengertian alami bahasa pemrograman, atau piranti penyediaan untuk pembangunan software. Subversion, bagaimanapun, bukan salah satu dari sitem ini; ia adalah sistem umum yang bisa digunakan untuk mengatur setiap koleksi file, termasuk kode sumber." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgstr "Beberapa sistem kontrol versi juga merupakan sistem manajemen konfigurasi perangkat lunak (SCM). Sistem ini terutama dibuat untuk mengatur susunan dari kode sumber, dan mempunyai banyak fitur yang khusus ke pengembangan perangkat lunak - seperti pengertian alami bahasa pemrograman, atau piranti penyediaan untuk pembangunan software. Git, bagaimanapun, bukan salah satu dari sitem ini; ia adalah sistem umum yang bisa digunakan untuk mengatur setiap koleksi file, termasuk kode sumber." # Indonesian#: source/TortoiseGit_en.xml:364(title) #. (title) @@ -448,22 +448,22 @@ msgstr "Sejarah TortoiseGit" # Indonesian#: source/TortoiseGit_en.xml:365(para) #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "Pada tahun 2002, Tim Kemp menemukan bahwa Subversion merupakan sistem kontrol versi sangat baik, tapi kekurangan klien GUI yang baik. Ide untuk klien Subversion sebagai shell Windows terintegrasi diilhami oleh klien yang mirip untuk CVS bernama TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "Pada tahun 2002, Tim Kemp menemukan bahwa Git merupakan sistem kontrol versi sangat baik, tapi kekurangan klien GUI yang baik. Ide untuk klien Git sebagai shell Windows terintegrasi diilhami oleh klien yang mirip untuk CVS bernama TortoiseCVS." # Indonesian#: source/TortoiseGit_en.xml:371(para) #. (para) #: ../source/TortoiseGit_en.xml:375 #, fuzzy -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Tim mempelajari kode sumber TortoiseCVS dan menggunakannya sebagai dasar untuk TortoiseGit. Kemudian dia memulai proyek, domain teregistrasi TortoiseGit.org dan menyimpan kode sumber secara online. Selama waktu itu, Stefan Küng sedang mencari sistem kontrol versi yang baik dan bebas dan menemukan Subversion serta sumber untuk TortoiseGit. Karena TortoiseGit masih belum siap untuk digunakan maka dia bergabung dengan proyek dan memulai pemrograman. Segera setelah dia menulis ulang banyak dari kode yang sudah ada dan mulai menambahkan perintah serta fitur, sampai ke titik di mana tidak ada kode asli yang tersisa." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Tim mempelajari kode sumber TortoiseCVS dan menggunakannya sebagai dasar untuk TortoiseGit. Kemudian dia memulai proyek, domain teregistrasi TortoiseGit.org dan menyimpan kode sumber secara online. Selama waktu itu, Stefan Küng sedang mencari sistem kontrol versi yang baik dan bebas dan menemukan Git serta sumber untuk TortoiseGit. Karena TortoiseGit masih belum siap untuk digunakan maka dia bergabung dengan proyek dan memulai pemrograman. Segera setelah dia menulis ulang banyak dari kode yang sudah ada dan mulai menambahkan perintah serta fitur, sampai ke titik di mana tidak ada kode asli yang tersisa." # Indonesian#: source/TortoiseGit_en.xml:383(para) #. (para) #: ../source/TortoiseGit_en.xml:386 #, fuzzy -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." -msgstr "Karena Subversion menjadi lebih stabil ia menarik semakin banyak pengguna yang juga mulai menggunakan TortoiseGit sebagai klien Subversion-nya. Basis pengguna tumbuh dengan cepat (dan masih tumbuh setiap hari). Itulah ketika Lübbe Onken menawarkan membantu dengan beberapa ikon bagus dan logo untuk TortoiseGit. Dan dia memelihara situs serta mengatur terjemahan." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgstr "Karena Git menjadi lebih stabil ia menarik semakin banyak pengguna yang juga mulai menggunakan TortoiseGit sebagai klien Git-nya. Basis pengguna tumbuh dengan cepat (dan masih tumbuh setiap hari). Itulah ketika Lübbe Onken menawarkan membantu dengan beberapa ikon bagus dan logo untuk TortoiseGit. Dan dia memelihara situs serta mengatur terjemahan." # Indonesian#: source/TortoiseGit_en.xml:396(title) #. (title) @@ -474,8 +474,8 @@ msgstr "Fitur TortoiseGit" # Indonesian#: source/TortoiseGit_en.xml:397(para) #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." -msgstr "Apa yang membuat TortoiseGit menjadi klien Subversion yang baik? Ini adalah daftar singkat dari fitur." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." +msgstr "Apa yang membuat TortoiseGit menjadi klien Git yang baik? Ini adalah daftar singkat dari fitur." # Indonesian#: source/TortoiseGit_en.xml:403(term) #. (term) @@ -522,20 +522,20 @@ msgstr "Status dari setiap file dan folder berversi ditunjukan oleh lapisan ikon # Indonesian#: source/TortoiseGit_en.xml:441(term) #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Akses mudah ke perintah Subversion" +msgid "Easy access to Git commands" +msgstr "Akses mudah ke perintah Git" # Indonesian#: source/TortoiseGit_en.xml:443(para) #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." -msgstr "Semua perintah Subversion tersedia dari menu konteks explorer. TortoiseGit menambahkannya sendiri submenu disana." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgstr "Semua perintah Git tersedia dari menu konteks explorer. TortoiseGit menambahkannya sendiri submenu disana." # Indonesian#: source/TortoiseGit_en.xml:451(para) #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "Karena TortoiseGit adalah klien Subversion, kami juga ingin memperlihatkan kepada Anda beberapa fitur Subversion sendiri:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" +msgstr "Karena TortoiseGit adalah klien Git, kami juga ingin memperlihatkan kepada Anda beberapa fitur Git sendiri:" # Indonesian#: source/TortoiseGit_en.xml:457(term) #. (term) @@ -546,8 +546,8 @@ msgstr "Pembuatan versi direktori" # Indonesian#: source/TortoiseGit_en.xml:459(para) #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS hanya melacak histori dari file individual, tapi Subversion mengimplementasikan sistem file berversi virtual yang melacak perubahan ke seluruh susunan direktori terus menerus. File dan direktori diversikan. Walhasil, ada perintah sisi-klien nyata memindahkan dan mengcopy yang beroperasi pada file dan direktori." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS hanya melacak histori dari file individual, tapi Git mengimplementasikan sistem file berversi virtual yang melacak perubahan ke seluruh susunan direktori terus menerus. File dan direktori diversikan. Walhasil, ada perintah sisi-klien nyata memindahkan dan mengcopy yang beroperasi pada file dan direktori." # Indonesian#: source/TortoiseGit_en.xml:472(term) #. (term) @@ -582,8 +582,8 @@ msgstr "Pilihan lapisan jaringan" # Indonesian#: source/TortoiseGit_en.xml:497(para) #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "Subversion mempunyai pengertian abstrak dari akses repositori, membuatnya mudah bagi orang untuk mengimplementasikan mekanisme jaringan baru. Server jaringan tingkat lanjut Subversion adalah modul untuk server web Apache, yang berbicara varian HTTP yang disebut WebDAV/DeltaV. Ini memberikan keuntungan besar untuk Subversion dalam stabilitas dan interoperabilitas, dan menyediakan berbagai fitur kunci bebas: otentikasi, otorisasi, kompresi sambungan, dan melihat repositori, sebagai contoh. Proses server Subversion sendiri yang lebih kecil juga tersedia. Server ini menggunakan protokol bebas yang bisa dilintasi dengan mudah melalui ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "Git mempunyai pengertian abstrak dari akses repositori, membuatnya mudah bagi orang untuk mengimplementasikan mekanisme jaringan baru. Server jaringan tingkat lanjut Git adalah modul untuk server web Apache, yang berbicara varian HTTP yang disebut WebDAV/DeltaV. Ini memberikan keuntungan besar untuk Git dalam stabilitas dan interoperabilitas, dan menyediakan berbagai fitur kunci bebas: otentikasi, otorisasi, kompresi sambungan, dan melihat repositori, sebagai contoh. Proses server Git sendiri yang lebih kecil juga tersedia. Server ini menggunakan protokol bebas yang bisa dilintasi dengan mudah melalui ssh." # Indonesian#: source/TortoiseGit_en.xml:515(term) #. (term) @@ -594,8 +594,8 @@ msgstr "Penanganan data konsisten" # Indonesian#: source/TortoiseGit_en.xml:517(para) #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." -msgstr "Subversion memperlihatkan perbedaan file menggunakan algoritma pembedaan biner, yang bekerja secara identik pada file teks (bisa dibaca-manusia) dan biner (tidak bisa dibaca-manusia). Kedua tipe file disimpan secara sama dipadatkan dalam repositori, dan perbedaan dikirimkan dalam kedua arah melintasi jaringan." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgstr "Git memperlihatkan perbedaan file menggunakan algoritma pembedaan biner, yang bekerja secara identik pada file teks (bisa dibaca-manusia) dan biner (tidak bisa dibaca-manusia). Kedua tipe file disimpan secara sama dipadatkan dalam repositori, dan perbedaan dikirimkan dalam kedua arah melintasi jaringan." # Indonesian#: source/TortoiseGit_en.xml:528(term) #. (term) @@ -606,8 +606,8 @@ msgstr "Pembuatan cabang dan tag secara efisien" # Indonesian#: source/TortoiseGit_en.xml:530(para) #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." -msgstr "Biaya pencabangan dan tag tidak perlu proporsional pada besarnya proyek. Subversion membuat cabang dan tag dengan cukup mengcopy proyek, menggunakan mekanisme mirip dengan link-kasar. Selanjutnya operasi ini hanya memerlukan waktu hanya sebentar, dan ruang sangat kecil dalam repositori." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgstr "Biaya pencabangan dan tag tidak perlu proporsional pada besarnya proyek. Git membuat cabang dan tag dengan cukup mengcopy proyek, menggunakan mekanisme mirip dengan link-kasar. Selanjutnya operasi ini hanya memerlukan waktu hanya sebentar, dan ruang sangat kecil dalam repositori." # Indonesian#: source/TortoiseGit_en.xml:541(term) #. (term) @@ -618,8 +618,8 @@ msgstr "Kemampuan di-hack" # Indonesian#: source/TortoiseGit_en.xml:543(para) #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Subversion tidak mempunyai bagasi historis; ia diimplementasikan sebagai kumpulan dari librari C berbagi dengan API yang didefinisikan-baik. Ini menjadikan Subversion bisa dipelihara secara ekstrim dan berguna bagi bahasa dan aplikasi lainnya." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." +msgstr "Git tidak mempunyai bagasi historis; ia diimplementasikan sebagai kumpulan dari librari C berbagi dengan API yang didefinisikan-baik. Ini menjadikan Git bisa dipelihara secara ekstrim dan berguna bagi bahasa dan aplikasi lainnya." # Indonesian#: source/TortoiseGit_en.xml:558(title) #. (title) @@ -794,26 +794,26 @@ msgstr "Konsep Dasar" # Indonesian#: source/TortoiseGit_en.xml:734(para) #. (primary) #: ../source/TortoiseGit_en.xml:725 -msgid "Subversion book" -msgstr "Buku Subversion" +msgid "Git book" +msgstr "Buku Git" # Indonesian#: source/TortoiseGit_en.xml:741(para) #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." -msgstr "Bab ini adalah versi bab yang sama dalam buku Subversion dengan sedikit modifikasi. Versi daring dari buku Subversion tersedia di sini: http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." +msgstr "Bab ini adalah versi bab yang sama dalam buku Git dengan sedikit modifikasi. Versi daring dari buku Git tersedia di sini: http://svnbook.red-bean.com/." # Indonesian#: source/TortoiseGit_en.xml:748(para) #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." -msgstr "Bab ini adalah pengenalan pendek dan kasual terhadap Subversion. Jika Anda baru mengenal kontrol versi, bab ini benar-benar untuk Anda. Kami mulai dengan diskusi konsep kontrol versi umum, bekerja dengan cara kami ke dalam ide spesifik di belakang Subversion, dan memperlihatkan contoh sederhana dari penggunaan Subversion." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." +msgstr "Bab ini adalah pengenalan pendek dan kasual terhadap Git. Jika Anda baru mengenal kontrol versi, bab ini benar-benar untuk Anda. Kami mulai dengan diskusi konsep kontrol versi umum, bekerja dengan cara kami ke dalam ide spesifik di belakang Git, dan memperlihatkan contoh sederhana dari penggunaan Git." # Indonesian#: source/TortoiseGit_en.xml:756(title) source/TortoiseGit_en.xml:1266(title) source/TortoiseGit_en.xml:2843(title) source/TortoiseGit_en.xml:3378(primary) source/TortoiseGit_en.xml:11528(glossterm) #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." -msgstr "Meskipun contoh dalam bab ini memperlihatkan orang berbagi koleksi kode sumber program, harap diingat bahwa Subversion bisa mengatur apapun dari koleksi file - tidak terbatas menolong pemrogram komputer." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." +msgstr "Meskipun contoh dalam bab ini memperlihatkan orang berbagi koleksi kode sumber program, harap diingat bahwa Git bisa mengatur apapun dari koleksi file - tidak terbatas menolong pemrogram komputer." # Indonesian#: source/TortoiseGit_en.xml:758(primary) #. (title) @@ -836,8 +836,8 @@ msgstr "repositori" # Indonesian#: source/TortoiseGit_en.xml:772(title) #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." -msgstr "Subversion adalah sistem terpusat untuk membagi informasi. Pada intinya ada repositori, yang merupakan pusat penyimpanan data. Repositori menyimpan informasi dalam bentuk susunan sistem file - hirarki umum dari file dan direktori. Beberapa klien tersambung ke repositori, dan kemudian membaca atau menulis ke file ini. Dengan penulisan data, klien membuat informasi tersedia bagi yang lain; dengan membaca data, klien menerima informasi dari yang lain." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgstr "Git adalah sistem terpusat untuk membagi informasi. Pada intinya ada repositori, yang merupakan pusat penyimpanan data. Repositori menyimpan informasi dalam bentuk susunan sistem file - hirarki umum dari file dan direktori. Beberapa klien tersambung ke repositori, dan kemudian membaca atau menulis ke file ini. Dengan penulisan data, klien membuat informasi tersedia bagi yang lain; dengan membaca data, klien menerima informasi dari yang lain." # Indonesian#: source/TortoiseGit_en.xml:775(para) #. (title) @@ -848,8 +848,8 @@ msgstr "Sistem Klien/Server Umum" # Indonesian#: source/TortoiseGit_en.xml:785(para) #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." -msgstr "Lalu mengapa ini menarik? Sampai sekarang, ini seperti definisi dari file server secara umum. Dan benar, repositori adalah sejenis file server, tapi bukan seperti yang Anda bayangkan. Apa yang membuat repositori Subversion istimewa adalah bahwa ia mengingat setiap perubahan yang pernah dituliskan: setiap perubahan ke setiap file, dan bahkan perubahan ke susunan direktori itu sendiri, seperti penambahan, penghapusan, dan pengaturan ulang dari file serta direktori." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgstr "Lalu mengapa ini menarik? Sampai sekarang, ini seperti definisi dari file server secara umum. Dan benar, repositori adalah sejenis file server, tapi bukan seperti yang Anda bayangkan. Apa yang membuat repositori Git istimewa adalah bahwa ia mengingat setiap perubahan yang pernah dituliskan: setiap perubahan ke setiap file, dan bahkan perubahan ke susunan direktori itu sendiri, seperti penambahan, penghapusan, dan pengaturan ulang dari file serta direktori." # Indonesian#: source/TortoiseGit_en.xml:801(title) #. (para) @@ -938,8 +938,8 @@ msgstr "Solusi Copy-Ubah-Gabung" # Indonesian#: source/TortoiseGit_en.xml:912(para) #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." -msgstr "Subversion, CVS, dan sistem kontrol versi lain menggunakan model copy-ubah-gabung sebagai alternatif penguncian. Dalam model ini, setiap klien pengguna membaca repositori dan membuat copy pekerjaan pribadi dari file atau proyek. Para pengguna kemudian bekerja secara paralel, mengubah copy pribadinya. Akhirnya, copy pribadi digabung bersama ke dalam versi yang baru dan final. Sistem kontrol versi sering membantu dengan penggabungan, tapi di atas segalanya, manusia yang bertanggung jawab membuatnya terjadi dengan benar." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgstr "Git, CVS, dan sistem kontrol versi lain menggunakan model copy-ubah-gabung sebagai alternatif penguncian. Dalam model ini, setiap klien pengguna membaca repositori dan membuat copy pekerjaan pribadi dari file atau proyek. Para pengguna kemudian bekerja secara paralel, mengubah copy pribadinya. Akhirnya, copy pribadi digabung bersama ke dalam versi yang baru dan final. Sistem kontrol versi sering membantu dengan penggabungan, tapi di atas segalanya, manusia yang bertanggung jawab membuatnya terjadi dengan benar." # Indonesian#: source/TortoiseGit_en.xml:928(title) #. (para) @@ -990,20 +990,20 @@ msgstr "Ada satu situasi umum di mana model kunci-ubah-buka kunci jauh lebih bai # Indonesian#: source/TortoiseGit_en.xml:985(title) #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" -msgstr "Apa yang Dilakukan Subversion?" +msgid "What does Git Do?" +msgstr "Apa yang Dilakukan Git?" # Indonesian#: source/TortoiseGit_en.xml:986(para) #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." -msgstr "Subversion menggunakan solusi copy-ubah-gabung secara bawaan, dan dalam banyak kasus ini adalah semua yang akan Anda perlukan. Akan tetapi, sejak Versi 1.2, Subversion juga mendukung penguncian file. Jadi jika Anda mempunyai file yang tidak bisa digabung, atau jika Anda dipaksa menggunakan kebijakan penguncian oleh manajemen, Subversion akan masih menyediakan fitur yang Anda butuhkan." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." +msgstr "Git menggunakan solusi copy-ubah-gabung secara bawaan, dan dalam banyak kasus ini adalah semua yang akan Anda perlukan. Akan tetapi, sejak Versi 1.2, Git juga mendukung penguncian file. Jadi jika Anda mempunyai file yang tidak bisa digabung, atau jika Anda dipaksa menggunakan kebijakan penguncian oleh manajemen, Git akan masih menyediakan fitur yang Anda butuhkan." # Indonesian#: source/TortoiseGit_en.xml:999(title) #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" -msgstr "Subversion dalam Aksi" +msgid "Git in Action" +msgstr "Git dalam Aksi" # Indonesian#: source/TortoiseGit_en.xml:1001(title) source/TortoiseGit_en.xml:11103(listitem) source/TortoiseGit_en.xml:11628(glossterm) #. (title) @@ -1020,33 +1020,33 @@ msgstr "copy pekerjaan" # Indonesian#: source/TortoiseGit_en.xml:1005(para) #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." -msgstr "Anda sudah membaca tentang copy pekerjaan; sekarang kami akan mendemonstrasikan bagaimana klien Subversion membuat dan menggunakannya." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." +msgstr "Anda sudah membaca tentang copy pekerjaan; sekarang kami akan mendemonstrasikan bagaimana klien Git membuat dan menggunakannya." # Indonesian#: source/TortoiseGit_en.xml:1010(para) #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." -msgstr "Copy pekerjaan Subversion adalah susunan direktori biasa pada sistem lokal Anda, dan berisi koleksi file. Anda bisa mengedit file-file ini sesuka Anda, dan jika ada file kode sumber, Anda bisa mengompilasi program Anda darinya seperti biasa. Copy pekerjaan Anda adalah area kerja pribadi Anda sendiri: Subversion tidak akan pernah menyatukan perubahan orang lain, maupun membuat perubahan Anda sendiri tersedia bagi yang lain, sampai Anda memberitahukan secara eksplisit untuk melakukannya." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgstr "Copy pekerjaan Git adalah susunan direktori biasa pada sistem lokal Anda, dan berisi koleksi file. Anda bisa mengedit file-file ini sesuka Anda, dan jika ada file kode sumber, Anda bisa mengompilasi program Anda darinya seperti biasa. Copy pekerjaan Anda adalah area kerja pribadi Anda sendiri: Git tidak akan pernah menyatukan perubahan orang lain, maupun membuat perubahan Anda sendiri tersedia bagi yang lain, sampai Anda memberitahukan secara eksplisit untuk melakukannya." # Indonesian#: source/TortoiseGit_en.xml:1021(para) #. (para) #: ../source/TortoiseGit_en.xml:1010 #, fuzzy -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." -msgstr "Setelah Anda membuat beberapa perubahan pada file dalam copy pekerjaan Anda dan memverifikasi bahwa mereka bekerja dengan benar, Subversion menyediakan kepada Anda perintah untuk \"menerbitkan\" perubahan Anda ke orang lain yang bekerja dengan Anda pada proyek Anda (dengan menulis ke repositori). Jika orang lain menerbitkan perubahan mereka sendiri, Subversion menyediakan kepada Anda perintah untuk menggabung perubahan-perubahan itu ke dalam direktori pekerjaan Anda (dengan membacanya dari repositori)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgstr "Setelah Anda membuat beberapa perubahan pada file dalam copy pekerjaan Anda dan memverifikasi bahwa mereka bekerja dengan benar, Git menyediakan kepada Anda perintah untuk \"menerbitkan\" perubahan Anda ke orang lain yang bekerja dengan Anda pada proyek Anda (dengan menulis ke repositori). Jika orang lain menerbitkan perubahan mereka sendiri, Git menyediakan kepada Anda perintah untuk menggabung perubahan-perubahan itu ke dalam direktori pekerjaan Anda (dengan membacanya dari repositori)." # Indonesian#: source/TortoiseGit_en.xml:1032(para) #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." -msgstr "Copy pekerjaan juga berisi beberapa file ekstra, dibuat dan dipelihara oleh Subversion, untuk membantunya menjalankan perintah ini. Pada khususnya, setiap direktori dalam copy pekerjaan Anda berisi subdirektori yang dinamai .svn, juga dikenal sebagai direktori administratif copy pekerjaan. File dalam setiap direktori administratif membantu Subversion mengenal file mana yang berisi perubahan yang belum diterbitkan, dan file mana yang ketinggalan zaman dibandingkan dengan pekerjaan orang lain." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgstr "Copy pekerjaan juga berisi beberapa file ekstra, dibuat dan dipelihara oleh Git, untuk membantunya menjalankan perintah ini. Pada khususnya, setiap direktori dalam copy pekerjaan Anda berisi subdirektori yang dinamai .svn, juga dikenal sebagai direktori administratif copy pekerjaan. File dalam setiap direktori administratif membantu Git mengenal file mana yang berisi perubahan yang belum diterbitkan, dan file mana yang ketinggalan zaman dibandingkan dengan pekerjaan orang lain." # Indonesian#: source/TortoiseGit_en.xml:1043(para) #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." -msgstr "Suatu repositori Subversion umum sering menampung file (atau kode sumber) untuk beberapa proyek; biasanya, setiap proyek adalah subdirektori dalam susunan sistem file repositori. Dalam pengaturan ini, copy pekerjaan pengguna akan terhubung ke subpohon tertentu dari repositori." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgstr "Suatu repositori Git umum sering menampung file (atau kode sumber) untuk beberapa proyek; biasanya, setiap proyek adalah subdirektori dalam susunan sistem file repositori. Dalam pengaturan ini, copy pekerjaan pengguna akan terhubung ke subpohon tertentu dari repositori." # Indonesian#: source/TortoiseGit_en.xml:1050(para) #. (para) @@ -1076,14 +1076,14 @@ msgstr "Untuk mendapatkan copy pekerjaan, Anda harus melakukan check # Indonesian#: source/TortoiseGit_en.xml:1186(para) #. (para) #: ../source/TortoiseGit_en.xml:1058 -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." -msgstr "Anggap Anda membuat perubahan ke button.c. Karena direktori .svn mengingat tanggal modifikasi file dan isi aslinya, Subversion bisa memberitahu bahwa Anda telah mengubah file. Akan tetapi, Subversion tidak mengumumkan perubahan Anda sampai Anda memberitahu Subversion secara eksplisit untuk melakukannya. Tindakan penerbitan perubahan Anda lebih umum dikenal sebagai mengkomit (atau checking in) perubahan ke repositori." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgstr "Anggap Anda membuat perubahan ke button.c. Karena direktori .svn mengingat tanggal modifikasi file dan isi aslinya, Git bisa memberitahu bahwa Anda telah mengubah file. Akan tetapi, Git tidak mengumumkan perubahan Anda sampai Anda memberitahu Git secara eksplisit untuk melakukannya. Tindakan penerbitan perubahan Anda lebih umum dikenal sebagai mengkomit (atau checking in) perubahan ke repositori." # Indonesian#: source/TortoiseGit_en.xml:1196(para) #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." -msgstr "Untuk menerbitkan perubahan Anda bagi yang lain, Anda bisa menggunakan perintah Subversion komit." +msgid "To publish your changes to others, you can use Git's commit command." +msgstr "Untuk menerbitkan perubahan Anda bagi yang lain, Anda bisa menggunakan perintah Git komit." # Indonesian#: source/TortoiseGit_en.xml:1200(para) #. (para) @@ -1094,20 +1094,20 @@ msgstr "Sekarang perubahan Anda ke button.c sudah dikomit k # Indonesian#: source/TortoiseGit_en.xml:1206(para) #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." -msgstr "Anggap Anda mempunyai kolaborator, Sally, yang melakukan check out copy pekerjaan /hitung pada saat yang sama seperti yang Anda lakukan. Ketika Anda mengkomit perubahan Anda ke button.c, copy pekerjaan Sally dibiarkan tidak berubah; Subversion hanya mengubah copy pekerjaan atas permintaan pengguna." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." +msgstr "Anggap Anda mempunyai kolaborator, Sally, yang melakukan check out copy pekerjaan /hitung pada saat yang sama seperti yang Anda lakukan. Ketika Anda mengkomit perubahan Anda ke button.c, copy pekerjaan Sally dibiarkan tidak berubah; Git hanya mengubah copy pekerjaan atas permintaan pengguna." # Indonesian#: source/TortoiseGit_en.xml:1214(para) #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." -msgstr "Agar proyeknya mutahir, Sally bisa meminta Subversion untuk memutahirkan copy pekerjaannya, dengan menggunakan perintah Subversion mutahirkan. Ini akan menyertakan perubahan Anda ke dalam copy pekerjaannya, juga bagi perubahan-perubahan lain yang telah dikomit sejak Sally melakukan check out." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgstr "Agar proyeknya mutahir, Sally bisa meminta Git untuk memutahirkan copy pekerjaannya, dengan menggunakan perintah Git mutahirkan. Ini akan menyertakan perubahan Anda ke dalam copy pekerjaannya, juga bagi perubahan-perubahan lain yang telah dikomit sejak Sally melakukan check out." # Indonesian#: source/TortoiseGit_en.xml:1222(para) #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." -msgstr "Catatan bahwa Sally tidak perlu untuk menetapkan file yang mana yang dimutahirkan; Subversion menggunakan informasi dalam direktori .svn, dan informasi lebih lanjut dalam repositori, untuk memutuskan file yang perlu dimutahirkan." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgstr "Catatan bahwa Sally tidak perlu untuk menetapkan file yang mana yang dimutahirkan; Git menggunakan informasi dalam direktori .svn, dan informasi lebih lanjut dalam repositori, untuk memutuskan file yang perlu dimutahirkan." # Indonesian#: source/TortoiseGit_en.xml:1071(title) #. (title) @@ -1118,8 +1118,8 @@ msgstr "URL Repositori" # Indonesian#: source/TortoiseGit_en.xml:1072(para) #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" -msgstr "Repositori Subversion bisa diakses melalui banyak metode berbeda - pada diska lokal, atau melalui berbagai protokol jaringan. Lokasi repositori, bagaimanapun juga, selalu URL. Skema URL menunjukan metode akses:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgstr "Repositori Git bisa diakses melalui banyak metode berbeda - pada diska lokal, atau melalui berbagai protokol jaringan. Lokasi repositori, bagaimanapun juga, selalu URL. Skema URL menunjukan metode akses:" # Indonesian#: source/TortoiseGit_en.xml:1079(title) #. (title) @@ -1162,8 +1162,8 @@ msgstr "http://" # Indonesian#: source/TortoiseGit_en.xml:1102(entry) #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "Mengakses via protokol WebDAV ke server Apache yang mengenal Subversion." +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "Mengakses via protokol WebDAV ke server Apache yang mengenal Git." # Indonesian#: source/TortoiseGit_en.xml:1108(literal) #. (literal) @@ -1219,8 +1219,8 @@ msgstr "terotentikasi, akses TCP/IP terenkripsi via protokol bebas ke suatu serv #. (para) #: ../source/TortoiseGit_en.xml:1168 #, fuzzy -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." -msgstr "Untuk bagian terbanyak, URL Subversion menggunakan sintaks standar, membolehkan nama server dan nomor port ditetapkan sebagai bagian dari URL. Metode akses file: biasanya digunakan untuk akses lokal, meskipun bisa digunakan dengan path UNC ke host di jaringan. Oleh karenanya URL mengambil bentuk file://hostname/path/ke/repos. Untuk mesin lokal, bagian nama host dari URL diharuskan kosong atau localhost. Untuk alasan ini, path lokal biasanya muncul dengan tiga garis miring, file:///path/ke/repos." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgstr "Untuk bagian terbanyak, URL Git menggunakan sintaks standar, membolehkan nama server dan nomor port ditetapkan sebagai bagian dari URL. Metode akses file: biasanya digunakan untuk akses lokal, meskipun bisa digunakan dengan path UNC ke host di jaringan. Oleh karenanya URL mengambil bentuk file://hostname/path/ke/repos. Untuk mesin lokal, bagian nama host dari URL diharuskan kosong atau localhost. Untuk alasan ini, path lokal biasanya muncul dengan tiga garis miring, file:///path/ke/repos." # Indonesian#: source/TortoiseGit_en.xml:1148(para) #. (para) @@ -1292,8 +1292,8 @@ msgstr "Operasi svn commit bisa menerbitkan perubahan ke seju #. (para) #: ../source/TortoiseGit_en.xml:1231 #, fuzzy -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." -msgstr "Dalam repositori, setiap komit diperlakukan sebagai transaksi atomis: baik semua perubahan komit dimulai, ataupun tidak ada yang dimulai. Subversion mencoba untuk mempertahankan atomisitis ini saat menghadapi kerusakan program, kerusakan sistem, masalah jaringan, dan tindakan pengguna lainnya." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgstr "Dalam repositori, setiap komit diperlakukan sebagai transaksi atomis: baik semua perubahan komit dimulai, ataupun tidak ada yang dimulai. Git mencoba untuk mempertahankan atomisitis ini saat menghadapi kerusakan program, kerusakan sistem, masalah jaringan, dan tindakan pengguna lainnya." # Indonesian#: source/TortoiseGit_en.xml:1249(para) #. (para) @@ -1316,8 +1316,8 @@ msgstr "Angka Revisi Global" # Indonesian#: source/TortoiseGit_en.xml:1271(para) #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" -msgstr "Tidak seperti kebanyakan sistem kontrol versi lain itu, angka revisi Subversion berlaku untuk seluruh pohon, bukan file individual. Setiap angka revisi memilih suatu pohon keseluruhan, suatu kondisi tertentu dari repositori setelah beberapa perubahan yang dikomit. Cara lain untuk memikirkan tentang revisi N itu mewakili kondisi sistem file repositori setelah komit ke-N. Ketika Pengguna Subversion berbicara mengenai ``revisi 5 dari foo.c'', mereka benar-benar mengartikan ``foo.c seperti nampaknya dalam revisi 5.'' Catatan bahwa secara umum, revisi N dan M file tidak perlu berbeda!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgstr "Tidak seperti kebanyakan sistem kontrol versi lain itu, angka revisi Git berlaku untuk seluruh pohon, bukan file individual. Setiap angka revisi memilih suatu pohon keseluruhan, suatu kondisi tertentu dari repositori setelah beberapa perubahan yang dikomit. Cara lain untuk memikirkan tentang revisi N itu mewakili kondisi sistem file repositori setelah komit ke-N. Ketika Pengguna Git berbicara mengenai ``revisi 5 dari foo.c'', mereka benar-benar mengartikan ``foo.c seperti nampaknya dalam revisi 5.'' Catatan bahwa secara umum, revisi N dan M file tidak perlu berbeda!" # Indonesian#: source/TortoiseGit_en.xml:1287(para) #. (para) @@ -1385,8 +1385,8 @@ msgstr "" # Indonesian#: source/TortoiseGit_en.xml:1324(para) #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." -msgstr "Perubahan Sally pada integer.c akan terlihat dalam copy pekerjaan Anda, dan perubahan Anda masih akan ada dalam button.c. Dalam contoh ini, teks Makefile sama persis dalam revisi 4, 5, dan 6, tapi Subversion akan menandai copy pekerjaan Anda untuk Makefile dengan revisi 6 untuk menunjukan bahwa ia masih saat ini. Maka, setelah Anda melakukan pemutahiran bersih pada puncak dari copy pekerjaan Anda, ia umumnya akan merujuk ke tepat satu revisi dalam repositori." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgstr "Perubahan Sally pada integer.c akan terlihat dalam copy pekerjaan Anda, dan perubahan Anda masih akan ada dalam button.c. Dalam contoh ini, teks Makefile sama persis dalam revisi 4, 5, dan 6, tapi Git akan menandai copy pekerjaan Anda untuk Makefile dengan revisi 6 untuk menunjukan bahwa ia masih saat ini. Maka, setelah Anda melakukan pemutahiran bersih pada puncak dari copy pekerjaan Anda, ia umumnya akan merujuk ke tepat satu revisi dalam repositori." # Indonesian#: source/TortoiseGit_en.xml:1337(title) #. (title) @@ -1397,8 +1397,8 @@ msgstr "Bagaimana Copy Pekerjaan Melacak Repositori" # Indonesian#: source/TortoiseGit_en.xml:1338(para) #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" -msgstr "Untuk setiap file dalam direktori pekerjaan, Subversion merekam dua bagian esensial dari informasi dalam area administratif .svn/:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" +msgstr "Untuk setiap file dalam direktori pekerjaan, Git merekam dua bagian esensial dari informasi dalam area administratif .svn/:" # Indonesian#: source/TortoiseGit_en.xml:1344(para) #. (para) @@ -1415,8 +1415,8 @@ msgstr "suatu cap waktu yang merekam kapan copy lokal dimutahirkan terakhir kali # Indonesian#: source/TortoiseGit_en.xml:1356(para) #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" -msgstr "Melalui informasi ini, dengan menghubungi repositori, Subversion bisa memberitahu suatu file pekerjaan dalam keadaan apa dari empat keadaan berikut:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" +msgstr "Melalui informasi ini, dengan menghubungi repositori, Git bisa memberitahu suatu file pekerjaan dalam keadaan apa dari empat keadaan berikut:" # Indonesian#: source/TortoiseGit_en.xml:1363(term) #. (term) @@ -1466,8 +1466,8 @@ msgstr "Diubah secara lokal, dan ketinggalan jaman" #. (para) #: ../source/TortoiseGit_en.xml:1395 #, fuzzy -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." -msgstr "File telah diubah dalam copy pekerjaan dan dalam repositori. Komit file akan gagal dengan kesalahan \"ketinggalan jaman\". File harus dimutahirkan dulu; perintah mutahirkan akan mencoba untuk menggabung perubahan umum dengan perubahan lokal. Jika Subversion tidak bisa menyelesaikan penggabungan dalam cara yang masuk akal secara otomatis, ia membiarkan pengguna untuk menyelesaikan konflik." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgstr "File telah diubah dalam copy pekerjaan dan dalam repositori. Komit file akan gagal dengan kesalahan \"ketinggalan jaman\". File harus dimutahirkan dulu; perintah mutahirkan akan mencoba untuk menggabung perubahan umum dengan perubahan lokal. Jika Git tidak bisa menyelesaikan penggabungan dalam cara yang masuk akal secara otomatis, ia membiarkan pengguna untuk menyelesaikan konflik." # Indonesian#: source/TortoiseGit_en.xml:1420(title) #. (title) @@ -1478,8 +1478,8 @@ msgstr "Ringkasan" # Indonesian#: source/TortoiseGit_en.xml:1421(para) #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "Kami menemukan sejumlah konsep fundamental Subversion dalam bab ini:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" +msgstr "Kami menemukan sejumlah konsep fundamental Git dalam bab ini:" # Indonesian#: source/TortoiseGit_en.xml:1426(para) #. (para) @@ -1490,14 +1490,14 @@ msgstr "Kami telah mengenalkan pengertian dari repositori sentral, copy pekerjaa # Indonesian#: source/TortoiseGit_en.xml:1432(para) #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." -msgstr "Kami melihat beberapa contoh sederhana bagaimana dua kolaborator bisa menggunakan Subversion untuk menerbitkan dan menerima perubahan dari yang lain, menggunakan model 'copy-ubah-gabung'." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgstr "Kami melihat beberapa contoh sederhana bagaimana dua kolaborator bisa menggunakan Git untuk menerbitkan dan menerima perubahan dari yang lain, menggunakan model 'copy-ubah-gabung'." # Indonesian#: source/TortoiseGit_en.xml:1439(para) #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." -msgstr "Kami telah membicarakan sedikit tentang cara Subversion melacak dan mengatur informasi dalam sebuah copy pekerjaan." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." +msgstr "Kami telah membicarakan sedikit tentang cara Git melacak dan mengatur informasi dalam sebuah copy pekerjaan." # Indonesian#: source/TortoiseGit_en.xml:1452(title) #. (title) @@ -1509,15 +1509,15 @@ msgstr "Menyiapkan Server" #. (para) #: ../source/TortoiseGit_en.xml:1447 #, fuzzy -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." -msgstr "Untuk menggunakan TortoiseGit (atau klien Subversion lain), Anda memerlukan tempat di mana repositori Anda ditempatkan. Anda bisa menyimpan repositori Anda secara lokal dan mengaksesnya menggunakan protokol file:// atau Anda menempatkannya pada server dan mengaksesnya dengan http:// atau protokol svn://. Dua protokol server berikut juga bisa dienkripsi. Anda menggunakan https:// atau svn+ssh://. Bab ini memperlihatkan kepada Anda langkah demi langkah bagaimana Anda menyiapkan server demikian pada mesin Windows." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgstr "Untuk menggunakan TortoiseGit (atau klien Git lain), Anda memerlukan tempat di mana repositori Anda ditempatkan. Anda bisa menyimpan repositori Anda secara lokal dan mengaksesnya menggunakan protokol file:// atau Anda menempatkannya pada server dan mengaksesnya dengan http:// atau protokol svn://. Dua protokol server berikut juga bisa dienkripsi. Anda menggunakan https:// atau svn+ssh://. Bab ini memperlihatkan kepada Anda langkah demi langkah bagaimana Anda menyiapkan server demikian pada mesin Windows." # Indonesian#: source/TortoiseGit_en.xml:9937(para) #. (para) #: ../source/TortoiseGit_en.xml:1458 #, fuzzy -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." -msgstr "Satu-satunya cara untuk menghapus data dari repositori adalah menggunakan piranti baris perintah Subversion svnadmin. Anda bisa menemukan penjelasan bagaimana ini bekerja dalam Repository Maintenance." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." +msgstr "Satu-satunya cara untuk menghapus data dari repositori adalah menggunakan piranti baris perintah Git svnadmin. Anda bisa menemukan penjelasan bagaimana ini bekerja dalam Repository Maintenance." # Indonesian#: source/TortoiseGit_en.xml:1464(para) #. (para) @@ -1546,8 +1546,8 @@ msgstr "Apache" # Indonesian#: source/TortoiseGit_en.xml:1479(para) #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" -msgstr "Yang paling fleksibel dari semua kemungkinan penyiapan server untuk Subversion adalah yang berbasis Apache. Meskipun sedikit lebih sulit untuk menyiapkan, ia menawarkan keuntungan yang tidak bisa disediakan oleh server lain:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgstr "Yang paling fleksibel dari semua kemungkinan penyiapan server untuk Git adalah yang berbasis Apache. Meskipun sedikit lebih sulit untuk menyiapkan, ia menawarkan keuntungan yang tidak bisa disediakan oleh server lain:" # Indonesian#: source/TortoiseGit_en.xml:1486(primary) source/TortoiseGit_en.xml:1490(term) #. (primary) @@ -1561,8 +1561,8 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 #, fuzzy -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." -msgstr "Server Subversion berbasis Apache menggunakan protokol WebDAV yang didukung oleh banyak program lain juga. Anda bisa contohmya menghidupkan repositori itu sebagai \"Webfolder\" dalam Windows explorer dan kemudian mengaksesnya seperti folder lain dalam sistem file" +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgstr "Server Git berbasis Apache menggunakan protokol WebDAV yang didukung oleh banyak program lain juga. Anda bisa contohmya menghidupkan repositori itu sebagai \"Webfolder\" dalam Windows explorer dan kemudian mengaksesnya seperti folder lain dalam sistem file" # Indonesian#: source/TortoiseGit_en.xml:1503(term) #. (term) @@ -1573,8 +1573,8 @@ msgstr "Melihat Repositori" # Indonesian#: source/TortoiseGit_en.xml:1505(para) #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." -msgstr "Anda bisa mengarahkan browser Anda ke URL dari repositori Anda dan melihat isinya tanpa harus menginstalasi klien Subversion. Ini memberikan akses ke data Anda ke lingkup pengguna yang lebih luas." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." +msgstr "Anda bisa mengarahkan browser Anda ke URL dari repositori Anda dan melihat isinya tanpa harus menginstalasi klien Git. Ini memberikan akses ke data Anda ke lingkup pengguna yang lebih luas." # Indonesian#: source/TortoiseGit_en.xml:1515(term) source/TortoiseGit_en.xml:3312(title) #. (term) @@ -1620,7 +1620,7 @@ msgstr "Harap dicatat bahwa Windows XP tanpa servicepack 1 akan membawa data jar #: ../source/TortoiseGit_en.xml:1555 #, fuzzy msgid "Download the latest version of the Apache web server from http://httpd.apache.org/download.cgi. Make sure that you download the version 2.2.x - the version 1.3.xx won't work!" -msgstr "Download versi terbaru dari server web Apache dari http://httpd.apache.org/download.cgi. Pastikan bahwa Anda mendownload versi > 2.0.54 - versi 1.3.xx tidak akan bekerja! Juga, versi lebih rendah dari 2.0.54 tidak akan bekerja dengan Subversion 1.2 karena bug dalam bagaimana Apache < 2.0.54 dibuat untuk Windows." +msgstr "Download versi terbaru dari server web Apache dari http://httpd.apache.org/download.cgi. Pastikan bahwa Anda mendownload versi > 2.0.54 - versi 1.3.xx tidak akan bekerja! Juga, versi lebih rendah dari 2.0.54 tidak akan bekerja dengan Git 1.2 karena bug dalam bagaimana Apache < 2.0.54 dibuat untuk Windows." #. (para) #: ../source/TortoiseGit_en.xml:1564 @@ -1676,21 +1676,21 @@ msgstr "Hal pertama yang Anda perlukan sebelum menginstalasi Apache adalah kompu # Indonesian#: source/TortoiseGit_en.xml:1616(title) #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Menginstalasi Subversion" +msgid "Installing Git" +msgstr "Menginstalasi Git" # Indonesian#: source/TortoiseGit_en.xml:1620(para) #. (para) #: ../source/TortoiseGit_en.xml:1632 #, fuzzy -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Download versi terbaru Subversion dari http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Download versi terbaru Git dari http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." # Indonesian#: source/TortoiseGit_en.xml:1628(para) #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." -msgstr "Jalankan instalator Subversion dan ikuti instruksi. Jika instalator Subversion mengenali Anda telah menginstalasi Apache, maka Anda hampir selesai. Jika ia tidak menemukan server Apache maka Anda harus melakukan beberapa langkah tambahan." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgstr "Jalankan instalator Git dan ikuti instruksi. Jika instalator Git mengenali Anda telah menginstalasi Apache, maka Anda hampir selesai. Jika ia tidak menemukan server Apache maka Anda harus melakukan beberapa langkah tambahan." # Indonesian#: source/TortoiseGit_en.xml:1638(primary) source/TortoiseGit_en.xml:2008(primary) #. (primary) @@ -1703,14 +1703,14 @@ msgstr "mod_authz_svn" # Indonesian#: source/TortoiseGit_en.xml:1640(para) #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "Menggunakan windows explorer, pergi ke direktori instalasi Subversion (biasanya c:\\program files\\Subversion) dan cari file /httpd/mod_dav_svn.so dan mod_authz_svn.so. Copy file ini ke direktori modul Apache (biasanya c:\\program files\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "Menggunakan windows explorer, pergi ke direktori instalasi Git (biasanya c:\\program files\\Git) dan cari file /httpd/mod_dav_svn.so dan mod_authz_svn.so. Copy file ini ke direktori modul Apache (biasanya c:\\program files\\apache group\\apache2\\modules )." # Indonesian#: source/TortoiseGit_en.xml:1653(para) #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." -msgstr "Salin file /bin/libdb*.dll dan /bin/intl3_svn.dll dari direktori instalasi Subversion ke direktori bin Apache." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." +msgstr "Salin file /bin/libdb*.dll dan /bin/intl3_svn.dll dari direktori instalasi Git ke direktori bin Apache." # Indonesian#: source/TortoiseGit_en.xml:1659(para) #. (para) @@ -1756,12 +1756,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "Di akhir file Konfig tambah baris berikut: \n" "<Location /svn>\n" @@ -1770,12 +1770,12 @@ msgstr "" "SVNParentPath D:\\SVN\n" "#SVNIndexXSLT \"/svnindex.xsl\"\n" "AuthType Basic\n" -"AuthName \"Subversion repositories\"\n" +"AuthName \"Git repositories\"\n" "AuthUserFile passwd\n" "#AuthzSVNAccessFile svnaccessfile\n" "Require valid-user\n" "</Location>\n" -" Ini mengkonfigurasi Apache agar semua repositori Subversion Anda secara fisik ditempatkan di bawah D:\\SVN. Repositori dilayani ke luar dunia dari URL: http://MyServer/svn/ . Akses dibatasi ke pengguna/kata sandi terdaftar dalam file passwd." +" Ini mengkonfigurasi Apache agar semua repositori Git Anda secara fisik ditempatkan di bawah D:\\SVN. Repositori dilayani ke luar dunia dari URL: http://MyServer/svn/ . Akses dibatasi ke pengguna/kata sandi terdaftar dalam file passwd." # Indonesian#: source/TortoiseGit_en.xml:1717(para) #. (para) @@ -1803,15 +1803,15 @@ msgstr "Mulai lagi layanan Apache." # Indonesian#: source/TortoiseGit_en.xml:1741(para) #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "Arahkan browser Anda ke http://MyServer/svn/MyNewRepository (di mana MyNewRepository adalah nama dari repositori Subversion yang Anda buat sebelumnya). Jika semuanya berjalan baik Anda seharusnya ditanya nama pengguna dan kata sandi, kemudian Anda bisa melihat isi dari repositori Anda." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "Arahkan browser Anda ke http://MyServer/svn/MyNewRepository (di mana MyNewRepository adalah nama dari repositori Git yang Anda buat sebelumnya). Jika semuanya berjalan baik Anda seharusnya ditanya nama pengguna dan kata sandi, kemudian Anda bisa melihat isi dari repositori Anda." # Indonesian#: source/TortoiseGit_en.xml:1683(para) #. (para) #: ../source/TortoiseGit_en.xml:1703 #, fuzzy -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "Sekarang Anda telah menyiapkan Apache dan Subversion, tapi Apache tidak mengetahui bagaimana menangani klien-klien Subversion. Untuk membuat Apache mengetahui URL yang mana yang harus digunakan untuk repositori Subversion, Anda perlu mengedit file konfig Apache (biasanya ditempatkan di c:\\program files\\apache group\\apache2\\conf\\httpd.conf) dengan editor teks apapun yang Anda inginkan (contoh. Notepad): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "Sekarang Anda telah menyiapkan Apache dan Git, tapi Apache tidak mengetahui bagaimana menangani klien-klien Git. Untuk membuat Apache mengetahui URL yang mana yang harus digunakan untuk repositori Git, Anda perlu mengedit file konfig Apache (biasanya ditempatkan di c:\\program files\\apache group\\apache2\\conf\\httpd.conf) dengan editor teks apapun yang Anda inginkan (contoh. Notepad): " # Indonesian#: source/TortoiseGit_en.xml:1753(primary) #. (primary) @@ -1857,21 +1857,21 @@ msgstr "http://MyServer/svn/" # Indonesian#: source/TortoiseGit_en.xml:1774(entry) #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " -msgstr "berarti bahwa repositori Subversion tersedia dari URL " +msgid "means that the Git repositories are available from the URL " +msgstr "berarti bahwa repositori Git tersedia dari URL " # Indonesian#: source/TortoiseGit_en.xml:1781(entry) #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "memberitahu Apache modul mana yang bertanggung jawab untuk melayani URL itu - dalam hal ini modul Subversion." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." +msgstr "memberitahu Apache modul mana yang bertanggung jawab untuk melayani URL itu - dalam hal ini modul Git." # Indonesian#: source/TortoiseGit_en.xml:1788(entry) #. (entry) #: ../source/TortoiseGit_en.xml:1812 #, fuzzy -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." -msgstr "Untuk versi Subversion 1.3 dan lebih tinggi, direktif ini menghidupkan pendaftaran semua repositori yang tersedia dibawah SVNParentPath." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." +msgstr "Untuk versi Git 1.3 dan lebih tinggi, direktif ini menghidupkan pendaftaran semua repositori yang tersedia dibawah SVNParentPath." # Indonesian#: source/TortoiseGit_en.xml:1798(filename) #. (filename) @@ -1882,8 +1882,8 @@ msgstr "D:\\SVN" # Indonesian#: source/TortoiseGit_en.xml:1796(entry) #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " -msgstr "memberitahu Subversion untuk mencari repositori di bawah " +msgid "tells Git to look for repositories below " +msgstr "memberitahu Git untuk mencari repositori di bawah " #. (entry) #: ../source/TortoiseGit_en.xml:1827 @@ -1912,8 +1912,8 @@ msgstr "menetapkan file kata sandi yang mana yang digunakan untuk otentikasi" # Indonesian#: source/TortoiseGit_en.xml:1824(entry) #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "Lokasi dari file Akses untuk path di dalam repositori Subversion" +msgid "Location of the Access file for paths inside a Git repository" +msgstr "Lokasi dari file Akses untuk path di dalam repositori Git" # Indonesian#: source/TortoiseGit_en.xml:1831(entry) #. (entry) @@ -1948,11 +1948,11 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "Menggunakan batas file passwd dan menjamin akses ke semua repositori Anda sebagai unit. Jika Anda ingin lebih mengontrol pengguna mana yang mempunyai akses ke setiap folder di dalam repositori Anda bisa membuang komentar baris \n" "#AuthzSVNAccessFile svnaccessfile\n" -" dan membuat file akses Subversion. Apache akan memastikan bahwa hanya pengguna yang benar yang bisa mengakses lokasi /svn Anda, dan kemudian akan mengoper nama pengguna ke modul AuthzSVNAccessFile Subversion agar bisa mendapat akses granular berdasarkan aturan yang terdaftar dalam file akses Subversion. Perlu dicatat bahwa path ditetapkan sebagai repos:path atau cukup path. Jika Anda tidak menetapkan repositori tertentu, aturan akses itu akan diterapkan ke semua repositori di bawah SVNParentPath. Format dari file authorization-policy yang digunakan oleh mod_authz_svn dijelaskan dalam " +" dan membuat file akses Git. Apache akan memastikan bahwa hanya pengguna yang benar yang bisa mengakses lokasi /svn Anda, dan kemudian akan mengoper nama pengguna ke modul AuthzSVNAccessFile Git agar bisa mendapat akses granular berdasarkan aturan yang terdaftar dalam file akses Git. Perlu dicatat bahwa path ditetapkan sebagai repos:path atau cukup path. Jika Anda tidak menetapkan repositori tertentu, aturan akses itu akan diterapkan ke semua repositori di bawah SVNParentPath. Format dari file authorization-policy yang digunakan oleh mod_authz_svn dijelaskan dalam " #. (para) #: ../source/TortoiseGit_en.xml:1915 @@ -2001,14 +2001,14 @@ msgstr "Indeks proyek" #. (para) #: ../source/TortoiseGit_en.xml:1955 #, fuzzy -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." -msgstr "Jika Anda menggunakan direktif SVNParentPath maka Anda tidak harus mengubah file konfig Apache setiap kali Anda menambah repositori Subversion baru. Cukup buat repositori baru dibawah lokasi yang sama seperti repositori pertama dan Anda selesai! Dalam perusahaan saya, Saya mempunyai akses langsung ke folder tertentu itu pada server via SMB (akses file normal windows). Maka Saya cukup membuat folder baru disana, jalankan perintah TortoiseGit TortoiseGitBuat repositori disini... dan proyek baru mempunyai rumah..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgstr "Jika Anda menggunakan direktif SVNParentPath maka Anda tidak harus mengubah file konfig Apache setiap kali Anda menambah repositori Git baru. Cukup buat repositori baru dibawah lokasi yang sama seperti repositori pertama dan Anda selesai! Dalam perusahaan saya, Saya mempunyai akses langsung ke folder tertentu itu pada server via SMB (akses file normal windows). Maka Saya cukup membuat folder baru disana, jalankan perintah TortoiseGit TortoiseGitBuat repositori disini... dan proyek baru mempunyai rumah..." # Indonesian#: source/TortoiseGit_en.xml:1910(para) #. (para) #: ../source/TortoiseGit_en.xml:1969 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." -msgstr "Jika Anda menggunakan Subversion 1.3 atau terbaru, Anda bisa menggunakan direktif SVNListParentPath on untuk membolehkan Apache untuk menghasilkan daftar dari semua proyek yang tersedia jika Anda mengarahkan browser Anda di path utama daripada di repositori tertentu." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgstr "Jika Anda menggunakan Git 1.3 atau terbaru, Anda bisa menggunakan direktif SVNListParentPath on untuk membolehkan Apache untuk menghasilkan daftar dari semua proyek yang tersedia jika Anda mengarahkan browser Anda di path utama daripada di repositori tertentu." # Indonesian#: source/TortoiseGit_en.xml:2003(title) #. (title) @@ -2026,8 +2026,8 @@ msgstr "Otorisasi" #. (para) #: ../source/TortoiseGit_en.xml:1984 #, fuzzy -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." -msgstr "Modul mod_authz_svn membolehkan kontrol fine-grained dari perizinan akses berdasarkan nama pengguna dan path repositori. Ini tersedia dengan server Apache, dan sejak Subversion 1.3 itu tersedia juga dengan svnserve." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." +msgstr "Modul mod_authz_svn membolehkan kontrol fine-grained dari perizinan akses berdasarkan nama pengguna dan path repositori. Ini tersedia dengan server Apache, dan sejak Git 1.3 itu tersedia juga dengan svnserve." # Indonesian#: source/TortoiseGit_en.xml:2016(para) #. (para) @@ -2184,7 +2184,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2093 #, fuzzy msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -2198,7 +2198,7 @@ msgid "" "SSPIOfferBasic On\n" " within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" -"Untuk membuat lokasi Subversion menggunakan tipe otentikasi ini Anda harus mengubah baris \n" +"Untuk membuat lokasi Git menggunakan tipe otentikasi ini Anda harus mengubah baris \n" "AuthType Basic\n" " ke \n" "AuthType SSPI\n" @@ -2233,8 +2233,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2140 #, fuzzy -msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." -msgstr "File Subversion AuthzSVNAccessFile adalah sensitif huruf dalam hubungannya dengan nama-nama pengguna (\"JUser\" berbeda dari \"juser\")." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgstr "File Git AuthzSVNAccessFile adalah sensitif huruf dalam hubungannya dengan nama-nama pengguna (\"JUser\" berbeda dari \"juser\")." # Indonesian#: source/TortoiseGit_en.xml:2154(para) #. (para) @@ -2246,8 +2246,8 @@ msgstr "Dalam dunia Microsoft, Windows domain dan nama pengguna tidak sensitif h # Indonesian#: source/TortoiseGit_en.xml:2160(para) #. (para) #: ../source/TortoiseGit_en.xml:2150 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." -msgstr "Perbedaan ini bisa mengganggu Anda ketika menggunakan otentikasi SSPI karena windows domain dan nama-nama pengguna yang dioper ke Subversion dalam huruf yang sama seperti yang diketik oleh pengguna dalam promp. Internet Explorer sering mengoper nama pengguna ke Apache secara otomatis menggunakan apapun jenis huruf akun yang dibuat." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgstr "Perbedaan ini bisa mengganggu Anda ketika menggunakan otentikasi SSPI karena windows domain dan nama-nama pengguna yang dioper ke Git dalam huruf yang sama seperti yang diketik oleh pengguna dalam promp. Internet Explorer sering mengoper nama pengguna ke Apache secara otomatis menggunakan apapun jenis huruf akun yang dibuat." # Indonesian#: source/TortoiseGit_en.xml:2169(para) #. (para) @@ -2260,8 +2260,8 @@ msgstr "Hasil akhir adalah bahwa Anda memerlukan setidaknya dua entri dalam Auth #. (para) #: ../source/TortoiseGit_en.xml:2166 #, fuzzy -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." -msgstr "Log Kesalahan dan Akses Apache adalah teman terbaik Anda dalam mengatasi masalah seperti ini karena mereka akan membantu Anda memeriksa string nama pengguna yang dioper ke dalam modul Subversion's AuthzSVNAccessFile. Anda perlu bereksperiman dengan format pasti dari string pengguna dalam svnaccessfile (contoh. DOMAIN\\user vs. DOMAIN//user) agar semuanya bekerja." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgstr "Log Kesalahan dan Akses Apache adalah teman terbaik Anda dalam mengatasi masalah seperti ini karena mereka akan membantu Anda memeriksa string nama pengguna yang dioper ke dalam modul Git's AuthzSVNAccessFile. Anda perlu bereksperiman dengan format pasti dari string pengguna dalam svnaccessfile (contoh. DOMAIN\\user vs. DOMAIN//user) agar semuanya bekerja." # Indonesian#: source/TortoiseGit_en.xml:2250(title) #. (title) @@ -2278,8 +2278,8 @@ msgstr "Otentikasi multipel" # Indonesian#: source/TortoiseGit_en.xml:2254(para) #. (para) #: ../source/TortoiseGit_en.xml:2184 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." -msgstr "Ini juga mungkin untuk mempunyai lebih dari satu sumber otentikasi untuk repositori Subversion Anda. Untuk melakukan ini, Anda perlu untuk membuat setiap tipe otentikasi non-authoritative, agar Apache memeriksa sumber multipel untuk nama pengguna/kata sandi yang sama." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgstr "Ini juga mungkin untuk mempunyai lebih dari satu sumber otentikasi untuk repositori Git Anda. Untuk melakukan ini, Anda perlu untuk membuat setiap tipe otentikasi non-authoritative, agar Apache memeriksa sumber multipel untuk nama pengguna/kata sandi yang sama." # Indonesian#: source/TortoiseGit_en.xml:2261(para) #. (para) @@ -2313,7 +2313,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2338,7 +2338,7 @@ msgstr "" "SVNListParentPath on\n" "SVNParentPath D:\\SVN\n" "\n" -"AuthName \"Subversion repositories\"\n" +"AuthName \"Git repositories\"\n" "AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2463,15 +2463,15 @@ msgstr "SSL dan Internet Explorer" # Indonesian#: source/TortoiseGit_en.xml:2191(para) #. (para) #: ../source/TortoiseGit_en.xml:2339 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." -msgstr "Jika Anda mengamankan server Anda dengan SSL dan menggunakan otentikasi terhadap windows domain Anda akan menemukan bahwa melihat repositori dengan Internet Explorer tidak bekerja lagi. Jangan khawatir - ini hanya Internet Explorer tidak bisa mengotentikasi. Browsers lainnya tidak mempunyai masalah itu dan TortoiseGit dan klien Subversion lain masih bisa mengotentikasi." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." +msgstr "Jika Anda mengamankan server Anda dengan SSL dan menggunakan otentikasi terhadap windows domain Anda akan menemukan bahwa melihat repositori dengan Internet Explorer tidak bekerja lagi. Jangan khawatir - ini hanya Internet Explorer tidak bisa mengotentikasi. Browsers lainnya tidak mempunyai masalah itu dan TortoiseGit dan klien Git lain masih bisa mengotentikasi." # Indonesian#: source/TortoiseGit_en.xml:2205(para) #. (para) #: ../source/TortoiseGit_en.xml:2353 #, fuzzy -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." -msgstr "mendefinisikan direktif <Location /path> terpisah dalam file konfig apache, dan tambah SSPIBasicPreferred On. Ini akan membolehkan IE untuk mengotentikasi lagi, tapi browser lain dan Subversion tidak akan bisa untuk mengotentikasi terhadap lokasi itu." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." +msgstr "mendefinisikan direktif <Location /path> terpisah dalam file konfig apache, dan tambah SSPIBasicPreferred On. Ini akan membolehkan IE untuk mengotentikasi lagi, tapi browser lain dan Git tidak akan bisa untuk mengotentikasi terhadap lokasi itu." # Indonesian#: source/TortoiseGit_en.xml:2216(para) #. (para) @@ -2512,8 +2512,8 @@ msgstr "Memaksa akses SSL" #. (para) #: ../source/TortoiseGit_en.xml:2395 #, fuzzy -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." -msgstr "Ketika Anda telah menyiapkan SSL untuk membuat repositori Anda lebih aman, Anda mungkin ingin mematikan akses normal via non-ssl (http) dan hanya membolehkan akses https. Untuk melakukan ini, Anda harus menambah direktif lain ke Subversion <Location> blok: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." +msgstr "Ketika Anda telah menyiapkan SSL untuk membuat repositori Anda lebih aman, Anda mungkin ingin mematikan akses normal via non-ssl (http) dan hanya membolehkan akses https. Untuk melakukan ini, Anda harus menambah direktif lain ke Git <Location> blok: SSLRequireSSL." # Indonesian#: source/TortoiseGit_en.xml:2494(para) #. (para) @@ -2526,7 +2526,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2539,7 +2539,7 @@ msgstr "" "SVNParentPath D:\\SVN\n" "SSLRequireSSL\n" "AuthType Basic\n" -"AuthName \"Subversion repositories\"\n" +"AuthName \"Git repositories\"\n" "AuthUserFile passwd\n" "#AuthzSVNAccessFile svnaccessfile\n" "Require valid-user\n" @@ -2558,7 +2558,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2424 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." msgstr "" #. (para) @@ -2569,7 +2569,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2440 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" @@ -2588,10 +2588,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2612,8 +2612,8 @@ msgstr "Server Berbasis Svnserve" # Indonesian#: source/TortoiseGit_en.xml:2519(para) #. (para) #: ../source/TortoiseGit_en.xml:2485 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." -msgstr "Mungkin ada situasi dimana tidak mungkin untuk menggunakan Apache sebagai server Anda. Untungnya, Subversion menyertakan Svnserve - server berdikari yang ringan yang menggunakan protokol kustom melalui koneksi umum TCP/IP." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgstr "Mungkin ada situasi dimana tidak mungkin untuk menggunakan Apache sebagai server Anda. Untungnya, Git menyertakan Svnserve - server berdikari yang ringan yang menggunakan protokol kustom melalui koneksi umum TCP/IP." # Indonesian#: source/TortoiseGit_en.xml:2525(para) #. (para) @@ -2630,27 +2630,27 @@ msgstr "Menginstalasi svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2502 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:2543(para) #. (para) #: ../source/TortoiseGit_en.xml:2516 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." -msgstr "Jika Anda sudah mempunyai versi Subversion terinstalasi, dan svnserve berjalan, Anda perlu menghentikannya sebelum melanjutkan." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." +msgstr "Jika Anda sudah mempunyai versi Git terinstalasi, dan svnserve berjalan, Anda perlu menghentikannya sebelum melanjutkan." # Indonesian#: source/TortoiseGit_en.xml:2550(para) #. (para) #: ../source/TortoiseGit_en.xml:2522 #, fuzzy -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." -msgstr "Jalankan instalator Subversion. Jika Anda menjalankan instalator pada server Anda bisa melewati langkah ke-4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." +msgstr "Jalankan instalator Git. Jika Anda menjalankan instalator pada server Anda bisa melewati langkah ke-4." # Indonesian#: source/TortoiseGit_en.xml:2556(para) #. (para) #: ../source/TortoiseGit_en.xml:2528 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "Buka windows-explorer, pergi ke direktori instalasi Subversion (biasanya C:\\Program Files\\Subversion) dan dalam bin directory, cari file svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll dan ssleay32.dll - salin file ini, atau cukup salin semua yang ada dalam direktori bin, ke dalam direktori pada server Anda, contoh: c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "Buka windows-explorer, pergi ke direktori instalasi Git (biasanya C:\\Program Files\\Git) dan dalam bin directory, cari file svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll dan ssleay32.dll - salin file ini, atau cukup salin semua yang ada dalam direktori bin, ke dalam direktori pada server Anda, contoh: c:\\svnserve" # Indonesian#: source/TortoiseGit_en.xml:2573(title) #. (title) @@ -2728,8 +2728,8 @@ msgstr "Jalankan svnserve sebagai Layanan" # Indonesian#: source/TortoiseGit_en.xml:2644(para) #. (para) #: ../source/TortoiseGit_en.xml:2624 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." -msgstr "Menjalankan svnserve sebagai suatu pengguna biasanya bukan jalan yang terbaik. Itu berarti Anda selalu memerlukan seorang pengguna untuk log in dalam server Anda, dan mengingat-ingat untuk memulainya kembali setelah sebuah reboot. Cara yang lebih baik adalah menjalankan svnserve sebagai suatu layanan windows. Dimulai dengan Subversion 1.4, svnserve bisa diinstalasi sebagai layanan murni windows, dalam versi sebelumnya bisa diinstalasi menggunakan pembungkus." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." +msgstr "Menjalankan svnserve sebagai suatu pengguna biasanya bukan jalan yang terbaik. Itu berarti Anda selalu memerlukan seorang pengguna untuk log in dalam server Anda, dan mengingat-ingat untuk memulainya kembali setelah sebuah reboot. Cara yang lebih baik adalah menjalankan svnserve sebagai suatu layanan windows. Dimulai dengan Git 1.4, svnserve bisa diinstalasi sebagai layanan murni windows, dalam versi sebelumnya bisa diinstalasi menggunakan pembungkus." #. (para) #: ../source/TortoiseGit_en.xml:2631 @@ -2737,25 +2737,25 @@ msgstr "Menjalankan svnserve sebagai suatu pengguna biasanya bukan jalan yang te msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Untuk memasang svnserve sebagai layanan asli windows, jalankan perintah berikut semuanya dalam satu baris untuk membuat sebuah layanan yang akan dimulai secara otomatis saat windows dimulai. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -"\t--root c:\\repos\" displayname= \"Subversion\" depend= tcpip start= auto\n" +"\t--root c:\\repos\" displayname= \"Git\" depend= tcpip start= auto\n" " Jika salah satu dari path-path tersebut mengandung spasi, Anda harus menggunakan tanda kutip (tereskap) di sekeliling path tersebut, seperti ini: \n" -"sc create svnserve binpath= \"\\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -"\t--service --root c:\\repos\" displayname= \"Subversion\" depend= tcpip start= auto\n" +"sc create svnserve binpath= \"\\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +"\t--service --root c:\\repos\" displayname= \"Git\" depend= tcpip start= auto\n" " Anda juga dapat menambahkan sebuah keterangan setelah membuat layanan tersebut. Ini akan muncul di Windows Service Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" #. (para) @@ -2770,11 +2770,11 @@ msgstr "Perlu dicatat bahwa sc menggunakan format yang agak t msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Microsoft sekarang merekomendasikan layanan dijalankan dibawah baik akun Local Service atau Network Service. Lihat The Services and Service Accounts Security Planning Guide. Untuk membuat layanan dibawah akun Local Service, tambah berikut ke contoh di atas. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Catatan bahwa Anda harus memberikan hak akun Local Service terkait untuk Subversion dan repositori Anda, juga setiap aplikasi yang digunakan oleh naskah hook. Grup builtin untuk ini dinamakan \"LOCAL SERVICE\"." +" Catatan bahwa Anda harus memberikan hak akun Local Service terkait untuk Git dan repositori Anda, juga setiap aplikasi yang digunakan oleh naskah hook. Grup builtin untuk ini dinamakan \"LOCAL SERVICE\"." #. (para) #: ../source/TortoiseGit_en.xml:2678 @@ -2863,8 +2863,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2755 #, fuzzy -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" -msgstr "Jika Anda memelihara multipel repositori menggunakan database kata sandi sama, kegunaan otentikasi akan membuatnya lebih mudah bagi pengguna, karena TortoiseGit bisa menyimpan mandat Anda agar Anda hanya perlu memasukannya sekali. Informasi lebih jauh bisa ditemukan dalam buku Subversion, terutama dalam seksi <Create a 'users' file and realm dan Client Credentials Caching" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgstr "Jika Anda memelihara multipel repositori menggunakan database kata sandi sama, kegunaan otentikasi akan membuatnya lebih mudah bagi pengguna, karena TortoiseGit bisa menyimpan mandat Anda agar Anda hanya perlu memasukannya sekali. Informasi lebih jauh bisa ditemukan dalam buku Git, terutama dalam seksi <Create a 'users' file and realm dan Client Credentials Caching" # Indonesian#: source/TortoiseGit_en.xml:2309(title) #. (title) @@ -2886,12 +2886,12 @@ msgstr "Apa itu SASL?" #. (para) #: ../source/TortoiseGit_en.xml:2779 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2787 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:1515(term) source/TortoiseGit_en.xml:3312(title) @@ -2910,12 +2910,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2810 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2815 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." msgstr "" #. (para) @@ -2995,8 +2995,8 @@ msgstr "" # Indonesian#: source/TortoiseGit_en.xml:2813(para) #. (para) #: ../source/TortoiseGit_en.xml:2915 -msgid "Further information about svnserve can be found in the Version Control with Subversion." -msgstr "Informasi selanjutnya mengenai svnserve bisa ditemukan dalam Version control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." +msgstr "Informasi selanjutnya mengenai svnserve bisa ditemukan dalam Version control with Git." # Indonesian#: source/TortoiseGit_en.xml:2821(title) #. (title) @@ -3008,12 +3008,12 @@ msgstr "Otorisasi berbasis-path dengan svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" -"Dimulai dengan Subversion 1.3, svnserve mendukung skema otorisasi berbasis-path mod_authz_svn yang sama tersedia dengan server Apache. Anda perlu mengedit file conf/svnserve.conf dalam direktori repositori Anda dan menambahkan baris yang merujuk ke file otorisasi Anda. \n" +"Dimulai dengan Git 1.3, svnserve mendukung skema otorisasi berbasis-path mod_authz_svn yang sama tersedia dengan server Apache. Anda perlu mengedit file conf/svnserve.conf dalam direktori repositori Anda dan menambahkan baris yang merujuk ke file otorisasi Anda. \n" "[general]\n" "authz-db = authz\n" " Disini, authz adalah file yang Anda buat untuk mendefinisikan perijinan akses. Anda bisa menggunakan file terpisah untuk setiap repositori, atau Anda bisa menggunakan file yang sama untuk beberapa repositori. Baca untuk penjelasan dari format file." @@ -3021,14 +3021,14 @@ msgstr "" # Indonesian#: source/TortoiseGit_en.xml:2845(para) #. (para) #: ../source/TortoiseGit_en.xml:2946 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." -msgstr "Tidak masalah protokol yang Anda gunakan untuk mengakses repositori Anda, Anda selalu perlu untuk membuat setidaknya satu repositori. Ini bisa dikerjakan dengan klien baris perintah Subversion atau dengan TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." +msgstr "Tidak masalah protokol yang Anda gunakan untuk mengakses repositori Anda, Anda selalu perlu untuk membuat setidaknya satu repositori. Ini bisa dikerjakan dengan klien baris perintah Git atau dengan TortoiseGit." # Indonesian#: source/TortoiseGit_en.xml:2851(para) #. (para) #: ../source/TortoiseGit_en.xml:2951 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "Jika Anda belum membuat repositori Subversion, inilah waktu untuk membuatnya sekarang." +msgid "If you haven't created a Git repository yet, it's time to do that now." +msgstr "Jika Anda belum membuat repositori Git, inilah waktu untuk membuatnya sekarang." # Indonesian#: source/TortoiseGit_en.xml:2859(title) #. (title) @@ -3047,8 +3047,8 @@ msgstr "Buat Repositori Disini" #. (para) #: ../source/TortoiseGit_en.xml:2963 #, fuzzy -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." -msgstr "Anda bisa membuat repositori dengan ujung belakang FSFS atau dengan format lama tapi stabil Berkeley Database (BDB). Format FSFS lebih cepat dan sekarang bekerja pada jaringan berbagi dan Windows 98 tanpa masalah. Format BDB lebih stabil karena sudah diuji lebih lama. Baca Repository Data Stores dalam buku Subversion untuk informasi lebih jauh." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." +msgstr "Anda bisa membuat repositori dengan ujung belakang FSFS atau dengan format lama tapi stabil Berkeley Database (BDB). Format FSFS lebih cepat dan sekarang bekerja pada jaringan berbagi dan Windows 98 tanpa masalah. Format BDB lebih stabil karena sudah diuji lebih lama. Baca Repository Data Stores dalam buku Git untuk informasi lebih jauh." # Indonesian#: source/TortoiseGit_en.xml:2872(title) #. (title) @@ -3176,8 +3176,8 @@ msgstr "Path UNC" # Indonesian#: source/TortoiseGit_en.xml:2962(para) #. (para) #: ../source/TortoiseGit_en.xml:3094 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." -msgstr "Untuk mengakses repositori lokal Anda memerlukan path ke folder itu. Ingatlah bahwa Subversion mengharapkan semua path repositori dalam bentuk file:///C:/SVNRepository/. Perlu dicatat penggunaan dari garis miring maju." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgstr "Untuk mengakses repositori lokal Anda memerlukan path ke folder itu. Ingatlah bahwa Git mengharapkan semua path repositori dalam bentuk file:///C:/SVNRepository/. Perlu dicatat penggunaan dari garis miring maju." # Indonesian#: source/TortoiseGit_en.xml:2969(para) #. (para) @@ -3221,7 +3221,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3141 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." msgstr "" #. (para) @@ -3337,8 +3337,8 @@ msgstr "Jika Anda mengadopsi pendekatan tingkat atas /trunk /tags /bra # Indonesian#: source/TortoiseGit_en.xml:3441(para) #. (para) #: ../source/TortoiseGit_en.xml:3220 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." -msgstr "Untuk proyek tidak terkait Anda mungkin lebih ingin menggunakan repositori terpisah. Ketika Anda mengkomit perubahan, angka revisi dari seluruh repositori yang berubah, bukan angka revisi proyek. Mempunyai 2 proyek tidak terkait berbagi repositori bisa membuat ruang besar dalam angka revisi. Proyek Subversion dan TortoiseGit nampak di alamat host yang sama, tapi sebenarnya memisahkan sepenuhnya repositori yang membolehkan pengembangan independen, dan tidak ada kebingungan pada angka pembuatan." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgstr "Untuk proyek tidak terkait Anda mungkin lebih ingin menggunakan repositori terpisah. Ketika Anda mengkomit perubahan, angka revisi dari seluruh repositori yang berubah, bukan angka revisi proyek. Mempunyai 2 proyek tidak terkait berbagi repositori bisa membuat ruang besar dalam angka revisi. Proyek Git dan TortoiseGit nampak di alamat host yang sama, tapi sebenarnya memisahkan sepenuhnya repositori yang membolehkan pengembangan independen, dan tidak ada kebingungan pada angka pembuatan." # Indonesian#: source/TortoiseGit_en.xml:3451(para) #. (para) @@ -3436,8 +3436,8 @@ msgstr "" # Indonesian#: source/TortoiseGit_en.xml:3035(para) #. (para) #: ../source/TortoiseGit_en.xml:3332 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "Piranti svnadmin diinstalasi secara otomatis saat Anda menginstalasi klien baris perintah Subversion. Jika Anda menginstalasi piranti baris perintah pada Windows PC, cara terbaik adalah mendownload versi instalator Windows. Ia dikompres lebih efisien daripada versi .zip, maka download lebih kecil, dan menjaga seting path untuk Anda. Anda bisa mendownload versi terbaru dari kien baris perintah Subversion dari http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "Piranti svnadmin diinstalasi secara otomatis saat Anda menginstalasi klien baris perintah Git. Jika Anda menginstalasi piranti baris perintah pada Windows PC, cara terbaik adalah mendownload versi instalator Windows. Ia dikompres lebih efisien daripada versi .zip, maka download lebih kecil, dan menjaga seting path untuk Anda. Anda bisa mendownload versi terbaru dari kien baris perintah Git dari http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." # Indonesian#: source/TortoiseGit_en.xml:3049(title) #. (title) @@ -3471,8 +3471,8 @@ msgstr "Naskah Hook" #. (para) #: ../source/TortoiseGit_en.xml:3357 #, fuzzy -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." -msgstr "Naskah hook adalah program yang dipicu oleh beberapa peristiwa repositori, seperti pembuatan revisi baru atau modifikasi dari properti tidak berversi. Setiap hook diberi informasi cukup untuk memberitahu apa peristiwa itu, apa sasaran operasinya, dan nama pengguna dari orang yang memicu peristiwa. Tergantung pada output hook atau status hasil, program hook bisa melanjutkan tindakan, atau menghentikannya, atau menundanya dalam beberapa cara. Silahkan rujuk ke bab pada Hook Scripts dalam Buku Subversion untuk perincian lengkap mengenai hook yang diimplementasikan." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." +msgstr "Naskah hook adalah program yang dipicu oleh beberapa peristiwa repositori, seperti pembuatan revisi baru atau modifikasi dari properti tidak berversi. Setiap hook diberi informasi cukup untuk memberitahu apa peristiwa itu, apa sasaran operasinya, dan nama pengguna dari orang yang memicu peristiwa. Tergantung pada output hook atau status hasil, program hook bisa melanjutkan tindakan, atau menghentikannya, atau menundanya dalam beberapa cara. Silahkan rujuk ke bab pada Hook Scripts dalam Buku Git untuk perincian lengkap mengenai hook yang diimplementasikan." #. (para) #: ../source/TortoiseGit_en.xml:3372 @@ -3531,8 +3531,8 @@ msgstr "webview" #. (para) #: ../source/TortoiseGit_en.xml:3411 #, fuzzy -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." -msgstr "Jika Anda ingin membuat repositori Subversion Anda tersedia bagi yang lain Anda mungkin ingin menyertakan link dari website Anda. Satu cara untuk membuat ini lebih bisa diakses adalah menyertakan link checkout untuk pengguna TSVN lain." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgstr "Jika Anda ingin membuat repositori Git Anda tersedia bagi yang lain Anda mungkin ingin menyertakan link dari website Anda. Satu cara untuk membuat ini lebih bisa diakses adalah menyertakan link checkout untuk pengguna TSVN lain." # Indonesian#: source/TortoiseGit_en.xml:3098(para) #. (para) @@ -3603,20 +3603,20 @@ msgstr "Bimbingan Penggunaan Harian" # Indonesian#: source/TortoiseGit_en.xml:3131(para) #. (para) #: ../source/TortoiseGit_en.xml:3457 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." -msgstr "Dokumen ini menjelaskan penggunaan dari hari ke hari klien TortoiseGit. Ini bukan pengenalan ke sistem kontrol versi, dan bukan pengenalan pada Subversion (SVN). Ini lebih mirip tempat Anda kembali ketika Anda mengetahui secara tepat apa yang ingin Anda lakukan, tapi tidak begitu ingat bagaimana melakukannya." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgstr "Dokumen ini menjelaskan penggunaan dari hari ke hari klien TortoiseGit. Ini bukan pengenalan ke sistem kontrol versi, dan bukan pengenalan pada Git (SVN). Ini lebih mirip tempat Anda kembali ketika Anda mengetahui secara tepat apa yang ingin Anda lakukan, tapi tidak begitu ingat bagaimana melakukannya." # Indonesian#: source/TortoiseGit_en.xml:3139(para) #. (para) #: ../source/TortoiseGit_en.xml:3465 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." -msgstr "Jika Anda memerlukan pengenalan terhadap kontrol versi dengan Subversion, maka kami merekomendasikan Anda untuk membaca buku fantastik: Version control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." +msgstr "Jika Anda memerlukan pengenalan terhadap kontrol versi dengan Git, maka kami merekomendasikan Anda untuk membaca buku fantastik: Version control with Git." # Indonesian#: source/TortoiseGit_en.xml:3147(para) #. (para) #: ../source/TortoiseGit_en.xml:3472 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." -msgstr "Dokumen ini juga pekerjaan yang sedang berjalan, seperti halnya TortoiseGit dan Subversion. Jika Anda menemukan kesalahan, silahkan melaporkannya ke milis agar kami bisa memutahirkan dokumentasi. Beberapa foto layar dalam Petunjuk Penggunaan Harian (DUG) mungkin tidak merefleksikan kondisi software saat ini. Tolong maafkan kami. Kami sedang bekerja pada TortoiseGit dalam waktu bebas kami." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgstr "Dokumen ini juga pekerjaan yang sedang berjalan, seperti halnya TortoiseGit dan Git. Jika Anda menemukan kesalahan, silahkan melaporkannya ke milis agar kami bisa memutahirkan dokumentasi. Beberapa foto layar dalam Petunjuk Penggunaan Harian (DUG) mungkin tidak merefleksikan kondisi software saat ini. Tolong maafkan kami. Kami sedang bekerja pada TortoiseGit dalam waktu bebas kami." # Indonesian#: source/TortoiseGit_en.xml:3159(para) #. (para) @@ -3633,14 +3633,14 @@ msgstr "Anda harus terbiasa dengan sistem kontrol versi." # Indonesian#: source/TortoiseGit_en.xml:3169(para) #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." -msgstr "Anda harus mengetahui dasar dari Subversion." +msgid "You should know the basics of Git." +msgstr "Anda harus mengetahui dasar dari Git." # Indonesian#: source/TortoiseGit_en.xml:3174(para) #. (para) #: ../source/TortoiseGit_en.xml:3499 -msgid "You should have set up a server and/or have access to a Subversion repository." -msgstr "Anda harus sudah menyiapkan server dan/atau mempunyai akses ke repositori Subversion." +msgid "You should have set up a server and/or have access to a Git repository." +msgstr "Anda harus sudah menyiapkan server dan/atau mempunyai akses ke repositori Git." # Indonesian#: source/TortoiseGit_en.xml:7895(para) #. (para) @@ -3864,15 +3864,15 @@ msgstr "svn.username berisi mandat untuk otentikasi hanya-n #. (para) #: ../source/TortoiseGit_en.xml:3650 #, fuzzy -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " -msgstr "Jika repositori yang sedang Anda coba akses dilindungi kata sandi, Dialog otentikasi akan muncul. Masukkan nama pengguna dan kata sandi Anda. Kotak centang akan membuat TortoiseGit menyimpan mandat dalam direktori standar Subversion: $APPDATA\\Subversion\\auth dalam tiga subdirektori: Ada satu file untuk setiap server yang Anda akses, diformat sebagai teks biasa, agar Anda bisa menggunakan editor teks untuk memeriksa pada server mana file tersebut diterapkan. Untuk membuat Subversion dan TortoiseGit (dan setiap klien Subversion lain) melupakan mandat Anda untuk server tertentu, cukup hapus file terkait." +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " +msgstr "Jika repositori yang sedang Anda coba akses dilindungi kata sandi, Dialog otentikasi akan muncul. Masukkan nama pengguna dan kata sandi Anda. Kotak centang akan membuat TortoiseGit menyimpan mandat dalam direktori standar Git: $APPDATA\\Git\\auth dalam tiga subdirektori: Ada satu file untuk setiap server yang Anda akses, diformat sebagai teks biasa, agar Anda bisa menggunakan editor teks untuk memeriksa pada server mana file tersebut diterapkan. Untuk membuat Git dan TortoiseGit (dan setiap klien Git lain) melupakan mandat Anda untuk server tertentu, cukup hapus file terkait." # Indonesian#: source/TortoiseGit_en.xml:3351(para) #. (para) #: ../source/TortoiseGit_en.xml:3681 #, fuzzy -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." -msgstr "Jika Anda ingin membersihkan tembolok otentikasi untuk semua server, Anda bisa melakukannya dari halaman Umum dari dialog seting TortoiseGit. Tombol itu akan membersihkan semua data otentikasi yang disimpan dalam tembolok dari direktori auth Subversion, dan juga setiap data auth yang disimpan dalam registri oleh versi TortoiseGit sebelumnya. Lihat ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgstr "Jika Anda ingin membersihkan tembolok otentikasi untuk semua server, Anda bisa melakukannya dari halaman Umum dari dialog seting TortoiseGit. Tombol itu akan membersihkan semua data otentikasi yang disimpan dalam tembolok dari direktori auth Git, dan juga setiap data auth yang disimpan dalam registri oleh versi TortoiseGit sebelumnya. Lihat ." # Indonesian#: source/TortoiseGit_en.xml:3359(para) #. (para) @@ -3956,7 +3956,7 @@ msgstr "Gunakan browser repositori untuk membuat folder baru secara langsung dal #. (para) #: ../source/TortoiseGit_en.xml:3736 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:3525(para) @@ -4090,8 +4090,8 @@ msgstr "Sebagai contoh, Anda bisa melihat naskah pembangunan TortoiseGit. Itu di # Indonesian#: source/TortoiseGit_en.xml:3614(para) #. (para) #: ../source/TortoiseGit_en.xml:3916 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." -msgstr "Agar tidak mengganggu pengguna, kami juga menambahkan file TortoiseVars.bat ke daftar abaikan dari folder leluhurnya, contoh kami telah menyiapkan properti Subversion svn:ignore untuk menyertakan nama file itu. Dengan cara itu tidak akan ditampilkan sebagai tidak berversi pada setiap komit." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgstr "Agar tidak mengganggu pengguna, kami juga menambahkan file TortoiseVars.bat ke daftar abaikan dari folder leluhurnya, contoh kami telah menyiapkan properti Git svn:ignore untuk menyertakan nama file itu. Dengan cara itu tidak akan ditampilkan sebagai tidak berversi pada setiap komit." # Indonesian#: source/TortoiseGit_en.xml:3624(title) #. (title) @@ -4124,17 +4124,17 @@ msgstr "Kadang-kadang adalah berguna untuk membangun copy pekerjaan yang dibuat #: ../source/TortoiseGit_en.xml:3940 #, fuzzy msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" -"Katakanlah Anda melakukan check out copy pekerjaan /project1 ke D:\\dev\\project1. Pilih folder D:\\dev\\project1, klik kanan dan pilih Menu WindowsProperti dari menu konteks. Dialog Properti muncul. Lalu pergi ke tab Subversion. Di sana, Anda bisa mengeset properti. Klik Tambah.... Pilih properti svn:externals dari kotak kombo dan tulis dalam kotak edit url repositori dalam format nama url atau jika Anda ingin menetapkan revisi tertentu, nama -rREV url Anda bisa menambahkan multipel proyek eksternal, 1 per baris. Catatan bahwa URL harus diberi escape dengan benar atau tidak akan bekerja dengan baik. Sebagai contoh Anda harus menimpa setiap ruang dengan %20. Catatan bahwa tidak mungkin untuk menggunakan nama folder dengan ruang di dalamnya. Angap bahwa Anda sudah mengeset properti ini pada D:\\dev\\project1: \n" +"Katakanlah Anda melakukan check out copy pekerjaan /project1 ke D:\\dev\\project1. Pilih folder D:\\dev\\project1, klik kanan dan pilih Menu WindowsProperti dari menu konteks. Dialog Properti muncul. Lalu pergi ke tab Git. Di sana, Anda bisa mengeset properti. Klik Tambah.... Pilih properti svn:externals dari kotak kombo dan tulis dalam kotak edit url repositori dalam format nama url atau jika Anda ingin menetapkan revisi tertentu, nama -rREV url Anda bisa menambahkan multipel proyek eksternal, 1 per baris. Catatan bahwa URL harus diberi escape dengan benar atau tidak akan bekerja dengan baik. Sebagai contoh Anda harus menimpa setiap ruang dengan %20. Catatan bahwa tidak mungkin untuk menggunakan nama folder dengan ruang di dalamnya. Angap bahwa Anda sudah mengeset properti ini pada D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Sekarang klik Set dan komit perubahan Anda. Ketika Anda (atau pengguna lain) memutahirkan copy pekerjaan Anda, Subversion akan membuat subfolder D:\\dev\\project1\\sounds dan melakukan checkout proyek sounds, subfolder lainnya D:\\dev\\project1\\quick graphs yang berisi proyek grafik, dan akhirnya subfolder bersarang D:\\dev\\project1\\skins\\toolkit yang berisi revisi 21 dari proyek skin-maker." +" Sekarang klik Set dan komit perubahan Anda. Ketika Anda (atau pengguna lain) memutahirkan copy pekerjaan Anda, Git akan membuat subfolder D:\\dev\\project1\\sounds dan melakukan checkout proyek sounds, subfolder lainnya D:\\dev\\project1\\quick graphs yang berisi proyek grafik, dan akhirnya subfolder bersarang D:\\dev\\project1\\skins\\toolkit yang berisi revisi 21 dari proyek skin-maker." # Indonesian#: source/TortoiseGit_en.xml:3702(para) #. (para) @@ -4166,7 +4166,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4016 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." msgstr "" #. (term) @@ -4401,7 +4401,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4298 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." msgstr "" #. (title) @@ -4411,7 +4411,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4309 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." msgstr "" #. (title) @@ -4583,7 +4583,7 @@ msgstr "Kolom yang ditampilkan di pane bawah bisa diatur sesuai kesukaan Anda. J #. (para) #: ../source/TortoiseGit_en.xml:4495 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:3952(para) @@ -4608,8 +4608,8 @@ msgstr " " #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5337 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Terkadang file-file diubah namanya di luar Subversion, dan mereka muncul di daftar file sebagai file yang hilang dan file yang tidak terversi. Untuk menghindari kehilangan sejarah tersebut, Anda perlu untuk memberitahu Subversion tentang koneksi tersebut. Cukup pilih nama lama (hilang) dan nama baru (tidak terversi) dan gunakan Menu KonteksPerbaiki Pemindahan untuk memasangkan kedua file tersebut sebagai suatu perubahan nama." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Terkadang file-file diubah namanya di luar Git, dan mereka muncul di daftar file sebagai file yang hilang dan file yang tidak terversi. Untuk menghindari kehilangan sejarah tersebut, Anda perlu untuk memberitahu Git tentang koneksi tersebut. Cukup pilih nama lama (hilang) dan nama baru (tidak terversi) dan gunakan Menu KonteksPerbaiki Pemindahan untuk memasangkan kedua file tersebut sebagai suatu perubahan nama." #. (title) #. (title) @@ -4620,7 +4620,7 @@ msgstr "Daftar Perubahan" #. (para) #: ../source/TortoiseGit_en.xml:4539 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "" #. (title) @@ -4960,8 +4960,8 @@ msgstr "File Lokal Sudah Ada" # Indonesian#: source/TortoiseGit_en.xml:4244(para) #. (para) #: ../source/TortoiseGit_en.xml:4881 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." -msgstr "Ada kalanya ketika Anda mecoba memutahirkan, pemutahiran gagal dengan pesan yang mengatakan bahwa sudah ada file lokal disana dengan nama sama. Ini biasanya terjadi ketika Subversion mencoba melakukan checkout file berversi baru, dan menemukan bahwa file tidak berversi dari nama yang sama sudah ada dalam folder copy pekerjaan Anda. Subversion tidak akan menimpa file tidak berversi - yang mungkin berisi sesuatu yang sedang Anda kerjakan, yang secara kebetulan mempunyai nama file yang sama dengan yang digunakan pengembang lain untuk file yang baru dikomitnya." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgstr "Ada kalanya ketika Anda mecoba memutahirkan, pemutahiran gagal dengan pesan yang mengatakan bahwa sudah ada file lokal disana dengan nama sama. Ini biasanya terjadi ketika Git mencoba melakukan checkout file berversi baru, dan menemukan bahwa file tidak berversi dari nama yang sama sudah ada dalam folder copy pekerjaan Anda. Git tidak akan menimpa file tidak berversi - yang mungkin berisi sesuatu yang sedang Anda kerjakan, yang secara kebetulan mempunyai nama file yang sama dengan yang digunakan pengembang lain untuk file yang baru dikomitnya." # Indonesian#: source/TortoiseGit_en.xml:4254(para) #. (para) @@ -5021,28 +5021,28 @@ msgstr "filename.ext.rNEWREV" # Indonesian#: source/TortoiseGit_en.xml:4322(para) #. (para) #: ../source/TortoiseGit_en.xml:4960 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." -msgstr "Ini adalah file dimana klien Subversion Anda menerimanya dari server ketika Anda memutahirkan copy pekerjaan Anda. File ini terkait ke revisi HEAD dari repositori." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgstr "Ini adalah file dimana klien Git Anda menerimanya dari server ketika Anda memutahirkan copy pekerjaan Anda. File ini terkait ke revisi HEAD dari repositori." # Indonesian#: source/TortoiseGit_en.xml:4276(para) #. (para) #: ../source/TortoiseGit_en.xml:4915 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" -"Suatu saat, Anda akan menghadapi konflik ketika Anda memutahirkan file dari repositori. Konflik terjadi saat dua atau lebih pengembang mengubah beberapa baris yang sama dari file. Karena Subversion tidak mengetahui proyek Anda, ia meninggalkan penyelesaikan konflik kepada para pengembang. Kapan saja konflik dilaporkan, Anda harus membuka file yang dipertanyakan, dan mencari baris yang dimulai dengan string <<<<<<<. Area yang konflik ditandai seperi ini: \n" +"Suatu saat, Anda akan menghadapi konflik ketika Anda memutahirkan file dari repositori. Konflik terjadi saat dua atau lebih pengembang mengubah beberapa baris yang sama dari file. Karena Git tidak mengetahui proyek Anda, ia meninggalkan penyelesaikan konflik kepada para pengembang. Kapan saja konflik dilaporkan, Anda harus membuka file yang dipertanyakan, dan mencari baris yang dimulai dengan string <<<<<<<. Area yang konflik ditandai seperi ini: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Juga, untuk setiap file yang konflik Subversion menempatkan tiga file tambahan dalam direktori Anda: " +" Juga, untuk setiap file yang konflik Git menempatkan tiga file tambahan dalam direktori Anda: " # Indonesian#: source/TortoiseGit_en.xml:4332(para) #. (para) @@ -5059,8 +5059,8 @@ msgstr "Selanjutnya jalankan perintah TortoiseGit # Indonesian#: source/TortoiseGit_en.xml:4357(para) #. (para) #: ../source/TortoiseGit_en.xml:4994 -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." -msgstr "Jika Anda mempunyai konflik dengan file biner, Subversion tidak mencoba untuk menggabung file itu sendiri. File lokal tetap tidak diubah (persis seperti perubahan terakhir Anda) dan Anda mempunyai file filename.ext.r*. Jika Anda ingin mengabaikan perubahan Anda dan membiarkan versi repositori, cukup gunakan perintah Pulihkan. Jika Anda ingin memelihara versi Anda dan menimpa versi repositori, gunakan perintah Diselesaikan, lalu komit versi Anda." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgstr "Jika Anda mempunyai konflik dengan file biner, Git tidak mencoba untuk menggabung file itu sendiri. File lokal tetap tidak diubah (persis seperti perubahan terakhir Anda) dan Anda mempunyai file filename.ext.r*. Jika Anda ingin mengabaikan perubahan Anda dan membiarkan versi repositori, cukup gunakan perintah Pulihkan. Jika Anda ingin memelihara versi Anda dan menimpa versi repositori, gunakan perintah Diselesaikan, lalu komit versi Anda." # Indonesian#: source/TortoiseGit_en.xml:4367(para) #. (para) @@ -5119,15 +5119,15 @@ msgstr "ikon" # Indonesian#: source/TortoiseGit_en.xml:4405(para) #. (para) #: ../source/TortoiseGit_en.xml:5046 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "Sekarang bahwa Anda sudah melakukan check out copy pekerjaan dari repositori Subversion Anda bisa melihat file dalam windows explorer dengan ikon yang diubah. Ini adalah salah satu alasan mengapa TortoiseGit sangat populer. TortoiseGit menambahkan apa yang disebut lapisan ikon ke setiap file yang menimpa ikon file aslinya. Lapisan ikon berbeda tergantung pada status Subversion terhadap file." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." +msgstr "Sekarang bahwa Anda sudah melakukan check out copy pekerjaan dari repositori Git Anda bisa melihat file dalam windows explorer dengan ikon yang diubah. Ini adalah salah satu alasan mengapa TortoiseGit sangat populer. TortoiseGit menambahkan apa yang disebut lapisan ikon ke setiap file yang menimpa ikon file aslinya. Lapisan ikon berbeda tergantung pada status Git terhadap file." # Indonesian#: source/TortoiseGit_en.xml:4414(para) #. (para) #: ../source/TortoiseGit_en.xml:5054 #, fuzzy -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " Copy pekerjaan yang baru ter-check out mempunyai tanda centang hijau sebagai lapisan. Itu berarti bahwa status Subversion adalah normal." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " Copy pekerjaan yang baru ter-check out mempunyai tanda centang hijau sebagai lapisan. Itu berarti bahwa status Git adalah normal." # Indonesian#: source/TortoiseGit_en.xml:4420(para) #. (para) @@ -5147,15 +5147,15 @@ msgstr " Jika selama pemutahira #. (para) #: ../source/TortoiseGit_en.xml:5072 #, fuzzy -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." -msgstr " Jika Anda telah mengeset properti svn:needs-lock pada file, Subversion membuat file itu hanya-baca sampai Anda mendapatkan kunci pada file itu. File hanya baca mempunyai lapisan ini untuk menunjukan bahwa Anda harus mengunci file Hanya-baca dulu sebelum Anda bisa mengedit file tersebut." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgstr " Jika Anda telah mengeset properti svn:needs-lock pada file, Git membuat file itu hanya-baca sampai Anda mendapatkan kunci pada file itu. File hanya baca mempunyai lapisan ini untuk menunjukan bahwa Anda harus mengunci file Hanya-baca dulu sebelum Anda bisa mengedit file tersebut." # Indonesian#: source/TortoiseGit_en.xml:4440(para) #. (para) #: ../source/TortoiseGit_en.xml:5079 #, fuzzy -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." -msgstr " Jika Anda memegang kunci pada file, dan status Subversion adalah normal, lapisan ikon ini mengingatkan kepada Anda bahwa Anda harus melepaskan kunci jika Anda tidak menggunakannya untuk membolehkan yang lain untuk mengkomit perubahan mereka ke file." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgstr " Jika Anda memegang kunci pada file, dan status Git adalah normal, lapisan ikon ini mengingatkan kepada Anda bahwa Anda harus melepaskan kunci jika Anda tidak menggunakannya untuk membolehkan yang lain untuk mengkomit perubahan mereka ke file." # Indonesian#: source/TortoiseGit_en.xml:4447(para) #. (para) @@ -5197,7 +5197,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5124 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:4510(title) @@ -5716,8 +5716,8 @@ msgstr "Menyalin rincian log dari revisi-revisi terpilih ke clipboard. Tindakan # Indonesian#: source/TortoiseGit_en.xml:4914(para) #. (para) #: ../source/TortoiseGit_en.xml:5742 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." -msgstr "Mencari pesan log untuk teks yang Anda masukan. Ini mencari pesan log yang Anda masukan dan juga ringkasan tindakan yang dibuat oleh Subversion (ditampilkan dalam pane bawah). Pencarian tidak sensitif huruf." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." +msgstr "Mencari pesan log untuk teks yang Anda masukan. Ini mencari pesan log yang Anda masukan dan juga ringkasan tindakan yang dibuat oleh Git (ditampilkan dalam pane bawah). Pencarian tidak sensitif huruf." #. (para) #: ../source/TortoiseGit_en.xml:5581 @@ -5822,8 +5822,8 @@ msgstr "Memulihkan perubahan yang dibuat untuk file terpilih dalam revisi itu." # Indonesian#: source/TortoiseGit_en.xml:5014(para) #. (para) #: ../source/TortoiseGit_en.xml:5843 -msgid "View the Subversion properties for the selected item." -msgstr "Melihat properti Subversion untuk item yang dipilih." +msgid "View the Git properties for the selected item." +msgstr "Melihat properti Git untuk item yang dipilih." # Indonesian#: source/TortoiseGit_en.xml:5019(para) #. (para) @@ -5850,17 +5850,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5865 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5874 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5880 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "" #. (para) @@ -5902,8 +5902,8 @@ msgstr "Ketika dialog Tampilkan Log diminta dari dalam dialog Merge, secara bawa # Indonesian#: source/TortoiseGit_en.xml:5075(para) #. (para) #: ../source/TortoiseGit_en.xml:5935 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." -msgstr "Catatan bahwa Subversion saat ini mengimplementasi penggantian nama sebagai pasangan copy/hapus, maka mengganti nama file atau folder juga akan menyebabkan tampilan log berhenti jika opsi ini dicentang." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgstr "Catatan bahwa Git saat ini mengimplementasi penggantian nama sebagai pasangan copy/hapus, maka mengganti nama file atau folder juga akan menyebabkan tampilan log berhenti jika opsi ini dicentang." # Indonesian#: source/TortoiseGit_en.xml:5034(para) #. (para) @@ -5966,7 +5966,7 @@ msgstr "bugtracking" #. (para) #: ../source/TortoiseGit_en.xml:5990 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." msgstr "" #. (title) @@ -6006,8 +6006,8 @@ msgstr "Ada kalanya Anda mungkin ingin mengubah pesan log yang pernah Anda masuk #. (para) #: ../source/TortoiseGit_en.xml:6031 #, fuzzy -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." -msgstr "Subversion membiarkan Anda mengubah kedua pesan log serta pembuat dari revisi kapan saja Anda inginkan. Tapi karena perubahan itu tidak bisa dibatalkan (perubahan itu tidak diversi) standarnya fitur ini dimatikan. Untuk membuat ini bekerja Anda harus menyiapkan hook pre-revprop-change. Silahkan rujuk ke bab pada Hook Scripts dalam Buku Subversion untuk perincian mengenai bagaimana untuk melakukannya. Baca untuk mencari beberapa catatan selanjutnya guna mengimplementasikan hook pada mesin Windows." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgstr "Git membiarkan Anda mengubah kedua pesan log serta pembuat dari revisi kapan saja Anda inginkan. Tapi karena perubahan itu tidak bisa dibatalkan (perubahan itu tidak diversi) standarnya fitur ini dimatikan. Untuk membuat ini bekerja Anda harus menyiapkan hook pre-revprop-change. Silahkan rujuk ke bab pada Hook Scripts dalam Buku Git untuk perincian mengenai bagaimana untuk melakukannya. Baca untuk mencari beberapa catatan selanjutnya guna mengimplementasikan hook pada mesin Windows." # Indonesian#: source/TortoiseGit_en.xml:5130(para) #. (para) @@ -6019,8 +6019,8 @@ msgstr "Sekali Anda telah menyiapkan server Anda dengan hook yang dibutuhkan, An # Indonesian#: source/TortoiseGit_en.xml:5136(para) #. (para) #: ../source/TortoiseGit_en.xml:6051 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." -msgstr "Karena properti revisi Subversion tidak diversi, membuat perubahan ke properti demikian (sebagai contoh, properti pesan komit svn:log) akan menimpa nilai sebelumnya dari properti itu selamanya." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgstr "Karena properti revisi Git tidak diversi, membuat perubahan ke properti demikian (sebagai contoh, properti pesan komit svn:log) akan menimpa nilai sebelumnya dari properti itu selamanya." # Indonesian#: source/TortoiseGit_en.xml:5145(title) #. (title) @@ -6326,8 +6326,8 @@ msgstr "Perbedaan antara WC file/folder dan URL" #. (para) #: ../source/TortoiseGit_en.xml:6373 #, fuzzy -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." -msgstr "Jika Anda ingin melihat perbedaan antara file dalam copy pekerjaan Anda, dan file dalam setiap repositori Subversion, Anda bisa melakukan itu secara langsung dalam explorer dengan memilih file lalu menekan terus tombol Shift sementara mengklik kanan untuk mendapatkan menu konteks. Pilih TortoiseGitDiff dengan URL. Anda bisa melakukan hal yang sama untuk folder copy pekerjaan. TortoiseMerge menampilkan perbedaan ini dalam cara yang sama seperti menampilkan patchfile - daftar dari file yang berubah yang bisa Anda lihat satu per satu." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgstr "Jika Anda ingin melihat perbedaan antara file dalam copy pekerjaan Anda, dan file dalam setiap repositori Git, Anda bisa melakukan itu secara langsung dalam explorer dengan memilih file lalu menekan terus tombol Shift sementara mengklik kanan untuk mendapatkan menu konteks. Pilih TortoiseGitDiff dengan URL. Anda bisa melakukan hal yang sama untuk folder copy pekerjaan. TortoiseMerge menampilkan perbedaan ini dalam cara yang sama seperti menampilkan patchfile - daftar dari file yang berubah yang bisa Anda lihat satu per satu." # Indonesian#: source/TortoiseGit_en.xml:5410(term) #. (term) @@ -6669,7 +6669,7 @@ msgstr "tambah" #: ../source/TortoiseGit_en.xml:6719 #, fuzzy msgid "version new files" -msgstr "Properti Subversion" +msgstr "Properti Git" # Indonesian#: source/TortoiseGit_en.xml:5667(title) source/TortoiseGit_en.xml:5741(title) #. (title) @@ -6792,7 +6792,7 @@ msgstr "tag" #. (para) #: ../source/TortoiseGit_en.xml:6817 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." msgstr "" #. (para) @@ -6894,8 +6894,8 @@ msgstr "Daftar Abaikan global" # Indonesian#: source/TortoiseGit_en.xml:5786(para) #. (para) #: ../source/TortoiseGit_en.xml:6949 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." -msgstr "Cara lain untuk mengabaikan file adalah menambahkannya ke daftar abaikan global. Perbedaan besar disini adalah bahwa daftar abaikan global adalah properti klien. Ia berlaku untuk semua proyek Subversion, tapi hanya pada klien PC. Secara umum lebih baik untuk menggunakan properti svn:ignore bila mungkin, karena ia bisa diterapkan ke area proyek tertentu, dan bekerja bagi setiap orang yang melakukan check out proyek. Baca untuk informasi lengkapnya." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgstr "Cara lain untuk mengabaikan file adalah menambahkannya ke daftar abaikan global. Perbedaan besar disini adalah bahwa daftar abaikan global adalah properti klien. Ia berlaku untuk semua proyek Git, tapi hanya pada klien PC. Secara umum lebih baik untuk menggunakan properti svn:ignore bila mungkin, karena ia bisa diterapkan ke area proyek tertentu, dan bekerja bagi setiap orang yang melakukan check out proyek. Baca untuk informasi lengkapnya." # Indonesian#: source/TortoiseGit_en.xml:5799(title) #. (title) @@ -6906,8 +6906,8 @@ msgstr "Mengabaikan Item Berversi" # Indonesian#: source/TortoiseGit_en.xml:5800(para) #. (para) #: ../source/TortoiseGit_en.xml:6963 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." -msgstr "File dan folder berversi tidak pernah diabaikan - itu adalah fitur dari Subversion. Jika Anda memversi file karena kesalahan, baca untuk instruksi bagaimana untuk Tidak memversi it." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." +msgstr "File dan folder berversi tidak pernah diabaikan - itu adalah fitur dari Git. Jika Anda memversi file karena kesalahan, baca untuk instruksi bagaimana untuk Tidak memversi it." # Indonesian#: source/TortoiseGit_en.xml:5808(title) #. (title) @@ -6965,8 +6965,8 @@ msgstr "Salam pada salah satu karakter yang ditutupi dalam kurung kotak. Didalam # Indonesian#: source/TortoiseGit_en.xml:5812(para) #. (para) #: ../source/TortoiseGit_en.xml:6978 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " -msgstr "Pola abaikan Subversion menggunakan globbing nama file, satu teknik yang asalnya digunakan dalam Unix untuk menetapkan file menggunakan meta-karakter sebagai wildcard. Karakter berikut mempunyai arti khusus: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgstr "Pola abaikan Git menggunakan globbing nama file, satu teknik yang asalnya digunakan dalam Unix untuk menetapkan file menggunakan meta-karakter sebagai wildcard. Karakter berikut mempunyai arti khusus: " # Indonesian#: source/TortoiseGit_en.xml:5857(para) #. (para) @@ -7008,8 +7008,8 @@ msgstr "Menu konteks Explorer untuk file berversi" # Indonesian#: source/TortoiseGit_en.xml:5905(para) #. (para) #: ../source/TortoiseGit_en.xml:7053 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " -msgstr "Tidak seperti CVS, Subversion membolehkan Anda mengganti nama dan memindahkan file dan folder. Maka ada entri menu untuk menghapus dan mengganti nama dalam submenu TortoiseGit. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgstr "Tidak seperti CVS, Git membolehkan Anda mengganti nama dan memindahkan file dan folder. Maka ada entri menu untuk menghapus dan mengganti nama dalam submenu TortoiseGit. " # Indonesian#: source/TortoiseGit_en.xml:7713(term) #. (title) @@ -7034,7 +7034,7 @@ msgstr "hilangkan" #. (para) #: ../source/TortoiseGit_en.xml:7070 #, fuzzy -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "TortoiseGitHapus folder dari copy pekerjaan Anda." # Indonesian#: source/TortoiseGit_en.xml:5914(para) @@ -7047,8 +7047,8 @@ msgstr "Jika Anda menghapus file/direktori menggunakan TSVN, file dihapus dari c #. (para) #: ../source/TortoiseGit_en.xml:7094 #, fuzzy -msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." -msgstr "Jika Anda melakukan TortoiseGitHapus terhadap sebuah file, file tersebut akan dihapus dari salinan pekerjaan Anda saat itu juga dan juga ditandai untuk penghapusan dalam repositori pada komit berikutnya. Saat Anda melakukan TortoiseGitHapus terhadap sebuah folder, folder tersebut akan tetap ada dalam salinan pekerjaan Anda, tetapi lapisannya berubah untuk menandakan bahwa folder tersebut ditandai untuk penghapusan. Perbedaan perilaku ini adalah bagian Subversion, bukan TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." +msgstr "Jika Anda melakukan TortoiseGitHapus terhadap sebuah file, file tersebut akan dihapus dari salinan pekerjaan Anda saat itu juga dan juga ditandai untuk penghapusan dalam repositori pada komit berikutnya. Saat Anda melakukan TortoiseGitHapus terhadap sebuah folder, folder tersebut akan tetap ada dalam salinan pekerjaan Anda, tetapi lapisannya berubah untuk menandakan bahwa folder tersebut ditandai untuk penghapusan. Perbedaan perilaku ini adalah bagian Git, bukan TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:7111 @@ -7059,14 +7059,14 @@ msgstr "Jika Anda ingin menghapus sesuatu dari repositori tetapi menginginkan un # Indonesian#: source/TortoiseGit_en.xml:5972(para) #. (para) #: ../source/TortoiseGit_en.xml:7122 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." -msgstr "Jika file dihapus via explorer daripada penggunaan menu konteks TortoiseGit, dialog komit memperlihatkan file-file itu dan membolehkan Anda menghapusnya dari kontrol versi juga sebelum komit. Akan tetapi, jika Anda memutahirkan copy pekerjaan Anda, Subversion akan mengarahkan file yang hilang dan menimpanya dengan versi terbaru dari repositori. Jika Anda perlu untuk menghapus file terkontrol-versi, selalu gunakan TortoiseGitHapus agar Subversion itu tidak harus menebak apa sebenarnya yang ingin Anda lakukan." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." +msgstr "Jika file dihapus via explorer daripada penggunaan menu konteks TortoiseGit, dialog komit memperlihatkan file-file itu dan membolehkan Anda menghapusnya dari kontrol versi juga sebelum komit. Akan tetapi, jika Anda memutahirkan copy pekerjaan Anda, Git akan mengarahkan file yang hilang dan menimpanya dengan versi terbaru dari repositori. Jika Anda perlu untuk menghapus file terkontrol-versi, selalu gunakan TortoiseGitHapus agar Git itu tidak harus menebak apa sebenarnya yang ingin Anda lakukan." # Indonesian#: source/TortoiseGit_en.xml:5987(para) #. (para) #: ../source/TortoiseGit_en.xml:7136 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." -msgstr "Jika suatu folder dihapus via explorer daripada penggunaan menu konteks TortoiseGit, copy pekerjaan Anda akan rusak dan Anda tidak akan bisa mengkomit. Jika Anda memutahirkan copy pekerjaan Anda, Subversion akan menimpa folder yang hilang dengan versi terbaru dari repositori dan kemudian Anda bisa menghapusnya dengan cara yang benar menggunakan TortoiseGitHapus." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgstr "Jika suatu folder dihapus via explorer daripada penggunaan menu konteks TortoiseGit, copy pekerjaan Anda akan rusak dan Anda tidak akan bisa mengkomit. Jika Anda memutahirkan copy pekerjaan Anda, Git akan menimpa folder yang hilang dengan versi terbaru dari repositori dan kemudian Anda bisa menghapusnya dengan cara yang benar menggunakan TortoiseGitHapus." # Indonesian#: source/TortoiseGit_en.xml:6018(title) #. (title) @@ -7181,15 +7181,15 @@ msgstr "Perubahan lokal" #. (para) #: ../source/TortoiseGit_en.xml:7265 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:6053(para) #. (para) #: ../source/TortoiseGit_en.xml:7271 #, fuzzy -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" -msgstr "Ada (setidaknya) dua kemungkinan solusi untuk mengganti nama file tanpa kehilangan histori lognya. Ini penting untuk mengganti nama di dalam Subversion. Mengganti nama dalam explorer akan merusak copy pekerjaan Anda!!!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" +msgstr "Ada (setidaknya) dua kemungkinan solusi untuk mengganti nama file tanpa kehilangan histori lognya. Ini penting untuk mengganti nama di dalam Git. Mengganti nama dalam explorer akan merusak copy pekerjaan Anda!!!" # Indonesian#: source/TortoiseGit_en.xml:6062(para) #. (para) @@ -7250,7 +7250,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7327 #, fuzzy -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." msgstr "Seandainya Anda mempunyai dua file dalam repositori dengan nama yang sama tapi dibedakan hanya jenis huruf (contoh. TEST.TXT dan test.txt) Anda tidak bisa memutahirkan atau checkout direktori dimana file itu berada lagi." #. (para) @@ -7283,13 +7283,13 @@ msgstr "Pembetulan Perubahan Nama File" #. (para) #: ../source/TortoiseGit_en.xml:7359 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." -msgstr "Terkadang IDE Anda yang ramah akan mengubah nama file-file untuk Anda sebagai bagian praktek perefaktoran, dan tentu saja ia tidak memberitahu Subversion. Jika Anda mencoba untuk mengkomit perubahan-perubahan Anda, Subversion akan melihat nama file lama sebagai hilang dan yang baru sebagai file tidak berversi. Anda dapat saja mencawang nama file baru tersebut untuk membuatnya ditambahkan kedalamnya, tetapi Anda akan kehilangan jejak sejarahnya karena Subversion tidak mengetahui bahwa file-file tersebut berhubungan." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." +msgstr "Terkadang IDE Anda yang ramah akan mengubah nama file-file untuk Anda sebagai bagian praktek perefaktoran, dan tentu saja ia tidak memberitahu Git. Jika Anda mencoba untuk mengkomit perubahan-perubahan Anda, Git akan melihat nama file lama sebagai hilang dan yang baru sebagai file tidak berversi. Anda dapat saja mencawang nama file baru tersebut untuk membuatnya ditambahkan kedalamnya, tetapi Anda akan kehilangan jejak sejarahnya karena Git tidak mengetahui bahwa file-file tersebut berhubungan." #. (para) #: ../source/TortoiseGit_en.xml:7367 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Cara yang lebih baik adalah memberitahu Subversion bahwa perubahan ini sebetulnya adalah perubahan nama dan Anda dapat melakukan ini dalam dialog Komit dan Periksa Modifikasi. Cukup pilih nama lama (hilang) dan nama baru (tidak berversi) dan gunakan Menu KonteksBetulkan Pemindahan untuk memasangkan kedua file tersebut sebagai suatu perubahan nama." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Cara yang lebih baik adalah memberitahu Git bahwa perubahan ini sebetulnya adalah perubahan nama dan Anda dapat melakukan ini dalam dialog Komit dan Periksa Modifikasi. Cukup pilih nama lama (hilang) dan nama baru (tidak berversi) dan gunakan Menu KonteksBetulkan Pemindahan untuk memasangkan kedua file tersebut sebagai suatu perubahan nama." # Indonesian#: source/TortoiseGit_en.xml:8729(term) #. (title) @@ -7299,8 +7299,8 @@ msgstr "Rekursif ke dalam folder tidak berversi" #. (para) #: ../source/TortoiseGit_en.xml:7382 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." -msgstr "Biasanya Anda mengeset daftar abaikan Anda sedemikian rupa sehingga semua file-file yang digenerasi diabaikan dalam Subversion. Tetapi bagaimana jika Anda ingin menghilangkan semua file-file diabaikan tersebut untuk menghasilkan suatu pembangunan bersih? Biasanya Anda akan mengesetnya dalam makefile Anda, tetapi jika Anda sedang mendebug makefile tersebut atau sedang mengganti sistem pembangunan, suatu cara untuk membersihkannya akan menjadi berguna." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgstr "Biasanya Anda mengeset daftar abaikan Anda sedemikian rupa sehingga semua file-file yang digenerasi diabaikan dalam Git. Tetapi bagaimana jika Anda ingin menghilangkan semua file-file diabaikan tersebut untuk menghasilkan suatu pembangunan bersih? Biasanya Anda akan mengesetnya dalam makefile Anda, tetapi jika Anda sedang mendebug makefile tersebut atau sedang mengganti sistem pembangunan, suatu cara untuk membersihkannya akan menjadi berguna." #. (para) #: ../source/TortoiseGit_en.xml:7389 @@ -7409,15 +7409,15 @@ msgstr "membersihkan" # Indonesian#: source/TortoiseGit_en.xml:6139(para) #. (para) #: ../source/TortoiseGit_en.xml:7484 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." -msgstr "Jika perintah Subversion tidak bisa selesai dengan sukses, barangkali karena masalah server, copy pekerjaan Anda bisa berada dalam kondisi tidak konsisten. Dalam hal itu Anda perlu menggunakan TortoiseGitBersihkan pada folder. Adalah ide baik untuk melakukan ini di tingkat atas dari copy pekerjaan." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgstr "Jika perintah Git tidak bisa selesai dengan sukses, barangkali karena masalah server, copy pekerjaan Anda bisa berada dalam kondisi tidak konsisten. Dalam hal itu Anda perlu menggunakan TortoiseGitBersihkan pada folder. Adalah ide baik untuk melakukan ini di tingkat atas dari copy pekerjaan." # Indonesian#: source/TortoiseGit_en.xml:6151(para) #. (para) #: ../source/TortoiseGit_en.xml:7495 #, fuzzy -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." -msgstr "Bersihkan mempunyai efek samping berguna lain. Jika tanggal file berubah tetapi isinya tidak, Subversion tidak bisa mengatakan apakah ia benar-benar berubah kecuali dengan melakukan perbandingan byte-demi-byte dengan copy murni. Jika Anda mempunyai banyak file dalam kondisi ini membuat permintaan status sangat lambat, yang akan membuat banyak dialog lambat merespon. Menjalankan Pembersihan pada copy pekerjaan Anda akan mereparasi cap waktu yang rusak ini dan menyimpan kembali status periksa ke kecepatan penuh." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgstr "Bersihkan mempunyai efek samping berguna lain. Jika tanggal file berubah tetapi isinya tidak, Git tidak bisa mengatakan apakah ia benar-benar berubah kecuali dengan melakukan perbandingan byte-demi-byte dengan copy murni. Jika Anda mempunyai banyak file dalam kondisi ini membuat permintaan status sangat lambat, yang akan membuat banyak dialog lambat merespon. Menjalankan Pembersihan pada copy pekerjaan Anda akan mereparasi cap waktu yang rusak ini dan menyimpan kembali status periksa ke kecepatan penuh." # Indonesian#: source/TortoiseGit_en.xml:6163(title) #. (title) @@ -7428,8 +7428,8 @@ msgstr "Gunakan Cap Waktu Komit" # Indonesian#: source/TortoiseGit_en.xml:6164(para) #. (para) #: ../source/TortoiseGit_en.xml:7507 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." -msgstr "Beberapa rilis sebelumnya dari Subversion dipengaruhi oleh bug yang menyebabkan cap waktu tidak sama ketika Anda check out dengan mencentang opsi Gunakan cap waktu komit. Gunakan perintah Bersihkan untuk mempercepat copy pekerjaan ini." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgstr "Beberapa rilis sebelumnya dari Git dipengaruhi oleh bug yang menyebabkan cap waktu tidak sama ketika Anda check out dengan mencentang opsi Gunakan cap waktu komit. Gunakan perintah Bersihkan untuk mempercepat copy pekerjaan ini." # Indonesian#: source/TortoiseGit_en.xml:6173(title) #. (title) @@ -7446,47 +7446,47 @@ msgstr "properti" # Indonesian#: source/TortoiseGit_en.xml:6179(title) #. (title) #: ../source/TortoiseGit_en.xml:7523 -msgid "Explorer property page, Subversion tab" -msgstr "Halaman properti Explorer, tab Subversion" +msgid "Explorer property page, Git tab" +msgstr "Halaman properti Explorer, tab Git" # Indonesian#: source/TortoiseGit_en.xml:6177(para) #. (para) #: ../source/TortoiseGit_en.xml:7521 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." -msgstr " Ada kalanya Anda ingin mempunyai informasi terinci tentang file/direktori daripada hanya lapisan ikon. Anda bisa mendapatkan semua informasi yang disediakan Subversion dalam dialog properti explorer. Pilih file atau direktori dan pilih Menu Windowsproperti dalam menu konteks (catatan: ini properti normal entri menu yang disediakan explorer, bukan yang ada dalam submenu TortoiseGit!). Dalam kotak dialog properti sudah ditambahkan halaman properti baru untuk file/folder dibawah kontrol Subversion, dimana Anda bisa melihat semua informasi relevan tenang file/direktori yang dipilih." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." +msgstr " Ada kalanya Anda ingin mempunyai informasi terinci tentang file/direktori daripada hanya lapisan ikon. Anda bisa mendapatkan semua informasi yang disediakan Git dalam dialog properti explorer. Pilih file atau direktori dan pilih Menu Windowsproperti dalam menu konteks (catatan: ini properti normal entri menu yang disediakan explorer, bukan yang ada dalam submenu TortoiseGit!). Dalam kotak dialog properti sudah ditambahkan halaman properti baru untuk file/folder dibawah kontrol Git, dimana Anda bisa melihat semua informasi relevan tenang file/direktori yang dipilih." # Indonesian#: source/TortoiseGit_en.xml:6200(title) #. (title) #: ../source/TortoiseGit_en.xml:7543 -msgid "Subversion Properties" -msgstr "Properti Subversion" +msgid "Git Properties" +msgstr "Properti Git" # Indonesian#: source/TortoiseGit_en.xml:6200(title) #. (primary) #: ../source/TortoiseGit_en.xml:7545 #, fuzzy -msgid "Subversion properties" -msgstr "Properti Subversion" +msgid "Git properties" +msgstr "Properti Git" # Indonesian#: source/TortoiseGit_en.xml:6205(title) #. (title) #: ../source/TortoiseGit_en.xml:7551 -msgid "Subversion property page" -msgstr "Halaman properti Subversion" +msgid "Git property page" +msgstr "Halaman properti Git" # Indonesian#: source/TortoiseGit_en.xml:6203(para) #. (para) #: ../source/TortoiseGit_en.xml:7549 #, fuzzy -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." -msgstr " Anda bisa membaca dan mengeset properti Subversion dari dialog properti Windows, tapi juga dari TortoiseGitproperti dan di dalam daftar status TSVN, dari Menu konteksproperti." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgstr " Anda bisa membaca dan mengeset properti Git dari dialog properti Windows, tapi juga dari TortoiseGitproperti dan di dalam daftar status TSVN, dari Menu konteksproperti." # Indonesian#: source/TortoiseGit_en.xml:6220(para) #. (para) #: ../source/TortoiseGit_en.xml:7566 #, fuzzy -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." -msgstr "Anda bisa menambahkan properti Anda sendiri, atau beberapa properti dengan arti khusus dalam Subversion. Ini dimulai dengan svn:. svn:externals adalah properti seperti itu; lihat bagaimana untuk menangani eksternal dalam . Untuk informasi lebih jauh mengenai properti dalam Subversion lihat Special Properties." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgstr "Anda bisa menambahkan properti Anda sendiri, atau beberapa properti dengan arti khusus dalam Git. Ini dimulai dengan svn:. svn:externals adalah properti seperti itu; lihat bagaimana untuk menangani eksternal dalam . Untuk informasi lebih jauh mengenai properti dalam Git lihat Special Properties." # Indonesian#: source/TortoiseGit_en.xml:9519(entry) #. (title) @@ -7535,22 +7535,22 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7580 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "" # Indonesian#: source/TortoiseGit_en.xml:6703(para) #. (para) #: ../source/TortoiseGit_en.xml:7631 #, fuzzy -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." -msgstr "Adalah penting untuk mengerti bagaimana mencabangkan dan menggabung pekerjaan dalam Subversion sebelum Anda mulai menggunakannya, karena ini bisa menjadi sedikit rumit. Sangat direkomendasikan bahwa Anda sudah membaca bab Branching and Merging dalam buku Subversion, yang menyediakan penjelasan secara lengkap dan banyak contoh bagaimana penggunaannya." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." +msgstr "Adalah penting untuk mengerti bagaimana mencabangkan dan menggabung pekerjaan dalam Git sebelum Anda mulai menggunakannya, karena ini bisa menjadi sedikit rumit. Sangat direkomendasikan bahwa Anda sudah membaca bab Branching and Merging dalam buku Git, yang menyediakan penjelasan secara lengkap dan banyak contoh bagaimana penggunaannya." # Indonesian#: source/TortoiseGit_en.xml:2813(para) #. (para) #: ../source/TortoiseGit_en.xml:7641 #, fuzzy -msgid "For more information about properties in Subversion see the Special Properties." -msgstr "Informasi selanjutnya mengenai svnserve bisa ditemukan dalam Version control with Subversion." +msgid "For more information about properties in Git see the Special Properties." +msgstr "Informasi selanjutnya mengenai svnserve bisa ditemukan dalam Version control with Git." # Indonesian#: source/TortoiseGit_en.xml:6232(title) #. (title) @@ -7612,7 +7612,7 @@ msgstr "Properti svn:externals bisa digunakan untuk menarik p #: ../source/TortoiseGit_en.xml:7697 #, fuzzy msgid "Exporting and Importing Properties" -msgstr "Mengekspor suatu Copy Pekerjaan Subversion" +msgstr "Mengekspor suatu Copy Pekerjaan Git" #. (para) #: ../source/TortoiseGit_en.xml:7698 @@ -7673,12 +7673,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7759 #, fuzzy -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." -msgstr "Anda bisa mengkonfigurasi Subversion untuk mengeset properti secara otomatis pada file dan folder ketika mereka ditambahkan ke repositori. Baca untuk informasi selanjutnya." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgstr "Anda bisa mengkonfigurasi Git untuk mengeset properti secara otomatis pada file dan folder ketika mereka ditambahkan ke repositori. Baca untuk informasi selanjutnya." #. (para) #: ../source/TortoiseGit_en.xml:7764 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." msgstr "" #. (para) @@ -7705,8 +7705,8 @@ msgstr "Properti Komit" # Indonesian#: source/TortoiseGit_en.xml:6293(para) #. (para) #: ../source/TortoiseGit_en.xml:7801 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." -msgstr "Properti Subversion adalah berversi. Setelah Anda mengubah atau menambah properti Anda harus mengkomit perubahan Anda." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." +msgstr "Properti Git adalah berversi. Setelah Anda mengubah atau menambah properti Anda harus mengkomit perubahan Anda." # Indonesian#: source/TortoiseGit_en.xml:6299(title) #. (title) @@ -7717,8 +7717,8 @@ msgstr "Konflik pada properti" # Indonesian#: source/TortoiseGit_en.xml:6300(para) #. (para) #: ../source/TortoiseGit_en.xml:7808 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." -msgstr "Jika ada konflik pada komit perubahan, karena pengguna lain telah mengubah properti yang sama, Subversion membuat file .prej. Hapus file ini setelah Anda menyelesaikan konflik." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." +msgstr "Jika ada konflik pada komit perubahan, karena pengguna lain telah mengubah properti yang sama, Git membuat file .prej. Hapus file ini setelah Anda menyelesaikan konflik." # Indonesian#: source/TortoiseGit_en.xml:6318(title) #. (title) @@ -7767,7 +7767,7 @@ msgstr "tsvn:logtemplate digunakan dengan proyek yang mempuny #. (para) #: ../source/TortoiseGit_en.xml:7873 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." msgstr "" #. (para) @@ -7872,7 +7872,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8006 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:6443(title) @@ -7912,8 +7912,8 @@ msgstr "Fitur lain dari sistem kontrol versi adalah kemampuan untuk menandai rev #. (para) #: ../source/TortoiseGit_en.xml:8049 #, fuzzy -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." -msgstr "Subversion tidak mempunyai perintah khusus untuk pencabangan atau pembuatan tag, tapi sebaliknya menggunakan apa-yang-disebut copy murah. Copy murah mirip dengan link keras dalam Unix, yang berarti bahwa pembuatan copy lengkap dalam repositori, link internal dibuat, merujuk ke susunan/revisi tertentu. Alhasil, cabang dan tag sangat cepat untuk dibuat, dan mengambil hampir tidak ada ruang ekstra dalam repositori." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgstr "Git tidak mempunyai perintah khusus untuk pencabangan atau pembuatan tag, tapi sebaliknya menggunakan apa-yang-disebut copy murah. Copy murah mirip dengan link keras dalam Unix, yang berarti bahwa pembuatan copy lengkap dalam repositori, link internal dibuat, merujuk ke susunan/revisi tertentu. Alhasil, cabang dan tag sangat cepat untuk dibuat, dan mengambil hampir tidak ada ruang ekstra dalam repositori." # Indonesian#: source/TortoiseGit_en.xml:6480(title) #. (title) @@ -8090,8 +8090,8 @@ msgstr "Jika Anda mengubah copy pekerjaan yang dibuat dari cabang dan mengkomit, # Indonesian#: source/TortoiseGit_en.xml:6647(para) #. (para) #: ../source/TortoiseGit_en.xml:8236 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " -msgstr "Meskipun Subversion sendiri tidak membuat perbedaan antara tag dan cabang, cara mereka biasanya digunakan agak sedikit berbeda. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgstr "Meskipun Git sendiri tidak membuat perbedaan antara tag dan cabang, cara mereka biasanya digunakan agak sedikit berbeda. " # Indonesian#: source/TortoiseGit_en.xml:6692(title) #. (title) @@ -8121,8 +8121,8 @@ msgstr "Dimana cabang digunakan untuk memelihara baris terpisah dari pengembanga #. (para) #: ../source/TortoiseGit_en.xml:8290 #, fuzzy -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." -msgstr "Adalah penting untuk mengerti bagaimana mencabangkan dan menggabung pekerjaan dalam Subversion sebelum Anda mulai menggunakannya, karena ini bisa menjadi sedikit rumit. Sangat direkomendasikan bahwa Anda sudah membaca bab Branching and Merging dalam buku Subversion, yang menyediakan penjelasan secara lengkap dan banyak contoh bagaimana penggunaannya." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." +msgstr "Adalah penting untuk mengerti bagaimana mencabangkan dan menggabung pekerjaan dalam Git sebelum Anda mulai menggunakannya, karena ini bisa menjadi sedikit rumit. Sangat direkomendasikan bahwa Anda sudah membaca bab Branching and Merging dalam buku Git, yang menyediakan penjelasan secara lengkap dan banyak contoh bagaimana penggunaannya." #. (para) #: ../source/TortoiseGit_en.xml:8300 @@ -8157,7 +8157,7 @@ msgstr "Metode ini mengetengahkan kasus ketika Anda sudah membuat satu atau lebi #. (para) #: ../source/TortoiseGit_en.xml:8333 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." msgstr "" #. (term) @@ -8171,12 +8171,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8344 #, fuzzy -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." -msgstr "Metode ini mencakup hal saat Anda sudah membuat fitur cabang seperti dijelaskan dalam buku Subversion. Semua perubahan trunk sudah dikirimkan ke fitur cabang, minggu demi minggu, dan sekarang fitur menjadi lengkap yang ingin Anda gabung kembali ke trunk. Karena Anda sudah memelihara fitur cabang disinkronisasi dengan trunk, versi terbaru dari cabang dan trunk akan benar-benar sama kecuali untuk perubahan cabang Anda. Maka dalam kasus khusus ini, Anda ingin menggabung dengan membandingkan cabang dengan trunk." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgstr "Metode ini mencakup hal saat Anda sudah membuat fitur cabang seperti dijelaskan dalam buku Git. Semua perubahan trunk sudah dikirimkan ke fitur cabang, minggu demi minggu, dan sekarang fitur menjadi lengkap yang ingin Anda gabung kembali ke trunk. Karena Anda sudah memelihara fitur cabang disinkronisasi dengan trunk, versi terbaru dari cabang dan trunk akan benar-benar sama kecuali untuk perubahan cabang Anda. Maka dalam kasus khusus ini, Anda ingin menggabung dengan membandingkan cabang dengan trunk." #. (para) #: ../source/TortoiseGit_en.xml:8353 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "" #. (para) @@ -8198,12 +8198,12 @@ msgstr "Menggabung Dua Pohon yang Berbeda" #. (para) #: ../source/TortoiseGit_en.xml:8383 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8391 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:6745(title) @@ -8253,7 +8253,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8454 -msgid "If you are merging revisions in chunks, the method shown in the subversion book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." +msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." msgstr "" #. (para) @@ -8282,7 +8282,7 @@ msgstr "Jika Anda sudah mempunyai gabungan beberapa perubahan dari cabang ini, d #. (para) #: ../source/TortoiseGit_en.xml:8499 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:6858(para) @@ -8394,8 +8394,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8609 #, fuzzy -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" -msgstr "Biasanya Anda ingin gabungan menjadi perhatian histori file, maka perubahan itu relatif ke asal yang umum digabung. Kadang kala Anda mungkin perlu untuk menggabung file yang mungkin terkait, tapi tidak dalam repositori Anda. Sebagai contoh Anda mungkin telah mengimpor versi 1 dan 2 dari librari pihak ketiga ke dalam direktori terpisah. Meskipun secara logika terkait, Subversion tidak mengetahui ini karena ia hanya melihat tarballs yang Anda impor. Jika Anda mencoba untuk menggabung perbedaan antara dua susunan ini Anda akan melihat penghapusan lengkap diikuti dengan penambahan lengkap. Agar Subversion hanya menggunakan perbedaan berbasis-path daripada perbedaan berbasis-histori, centang kotak Abaikan asal. Baca selengkapnya topik ini dalam buku Subversion, Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" +msgstr "Biasanya Anda ingin gabungan menjadi perhatian histori file, maka perubahan itu relatif ke asal yang umum digabung. Kadang kala Anda mungkin perlu untuk menggabung file yang mungkin terkait, tapi tidak dalam repositori Anda. Sebagai contoh Anda mungkin telah mengimpor versi 1 dan 2 dari librari pihak ketiga ke dalam direktori terpisah. Meskipun secara logika terkait, Git tidak mengetahui ini karena ia hanya melihat tarballs yang Anda impor. Jika Anda mencoba untuk menggabung perbedaan antara dua susunan ini Anda akan melihat penghapusan lengkap diikuti dengan penambahan lengkap. Agar Git hanya menggunakan perbedaan berbasis-path daripada perbedaan berbasis-histori, centang kotak Abaikan asal. Baca selengkapnya topik ini dalam buku Git, Noticing or Ignoring Ancestry" #. (para) #: ../source/TortoiseGit_en.xml:8626 @@ -8435,12 +8435,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8670 #, fuzzy -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." -msgstr "Ketika Anda sudah menguji perubahan dan mengkomit revisi ini, pesan log komit Anda akan selalu menyertakan angka revisi yang sudah dikirimkan dalam gabungan. Jika Anda ingin menerapkan gabungan lain waktu Anda akan memerlukan untuk mengetahui apa yang sudah Anda gabung, karena Anda tidak ingin mengirimkan perubahan lebih dari sekali. Sayangnya informasi gabungan tidak disimpan oleh Subversion. Untuk informasi lebih jauh mengenai ini, lihat Best Practices for Merging dalam buku Subversion." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." +msgstr "Ketika Anda sudah menguji perubahan dan mengkomit revisi ini, pesan log komit Anda akan selalu menyertakan angka revisi yang sudah dikirimkan dalam gabungan. Jika Anda ingin menerapkan gabungan lain waktu Anda akan memerlukan untuk mengetahui apa yang sudah Anda gabung, karena Anda tidak ingin mengirimkan perubahan lebih dari sekali. Sayangnya informasi gabungan tidak disimpan oleh Git. Untuk informasi lebih jauh mengenai ini, lihat Best Practices for Merging dalam buku Git." #. (para) #: ../source/TortoiseGit_en.xml:8687 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:6893(para) @@ -8460,8 +8460,8 @@ msgstr "Dalam hal ini Anda tidak memerlukan fitur cabang lagi karena fitur baru #. (para) #: ../source/TortoiseGit_en.xml:8709 #, fuzzy -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." -msgstr "Subversion tidak bisa menggabung file dengan folder dan sebaliknya - hanya folder dengan folder dan file dengan file. Jika Anda mengklik pada file dan membuka dialog gabung, maka Anda hrus memberikan path ke file dalam dialog itu. Jika Anda memilih folder dan muncul dialog, maka Anda harus menetapkan url folder untuk digabung." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgstr "Git tidak bisa menggabung file dengan folder dan sebaliknya - hanya folder dengan folder dan file dengan file. Jika Anda mengklik pada file dan membuka dialog gabung, maka Anda hrus memberikan path ke file dalam dialog itu. Jika Anda memilih folder dan muncul dialog, maka Anda harus menetapkan url folder untuk digabung." # Indonesian#: source/TortoiseGit_en.xml:6692(title) #. (title) @@ -8504,7 +8504,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8723 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " msgstr "" #. (para) @@ -8516,8 +8516,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8775 #, fuzzy -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." -msgstr "Download versi terbaru Subversion dari http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." +msgstr "Download versi terbaru Git dari http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:8783 @@ -8647,21 +8647,21 @@ msgstr "Perusahaan Anda selalu menggunakan penguncian VCS di masa lalu dan sudah # Indonesian#: source/TortoiseGit_en.xml:7046(para) #. (para) #: ../source/TortoiseGit_en.xml:8909 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " -msgstr "Subversion umumnya bekerja baik tanpa penguncian, menggunakan metode Copy-Ubah-Gabung seperti dijelaskan sebelumnya dalam . Akan tetapi ada sedikit turunan ketika Anda mungkin perlu untuk mengimplementasikan beberapa bentuk dari aturan penguncian. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgstr "Git umumnya bekerja baik tanpa penguncian, menggunakan metode Copy-Ubah-Gabung seperti dijelaskan sebelumnya dalam . Akan tetapi ada sedikit turunan ketika Anda mungkin perlu untuk mengimplementasikan beberapa bentuk dari aturan penguncian. " # Indonesian#: source/TortoiseGit_en.xml:7070(para) #. (para) #: ../source/TortoiseGit_en.xml:8933 #, fuzzy -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." -msgstr "Pertama Anda perlu memastikan server Subversion Anda dinaikan ke setidaknya versi 1.2. Versi sebelumnya tidak mendukung penguncian sama sekali. Jika Anda menggunakan akses file:///, maka tentunya hanya klien Anda yang perlu dimutahirkan." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgstr "Pertama Anda perlu memastikan server Git Anda dinaikan ke setidaknya versi 1.2. Versi sebelumnya tidak mendukung penguncian sama sekali. Jika Anda menggunakan akses file:///, maka tentunya hanya klien Anda yang perlu dimutahirkan." # Indonesian#: source/TortoiseGit_en.xml:7077(title) #. (title) #: ../source/TortoiseGit_en.xml:8940 -msgid "How Locking Works in Subversion" -msgstr "Bagaimana Penguncian Bekerja dalam Subversion" +msgid "How Locking Works in Git" +msgstr "Bagaimana Penguncian Bekerja dalam Git" # Indonesian#: source/TortoiseGit_en.xml:7078(para) #. (para) @@ -8678,8 +8678,8 @@ msgstr "Jika Anda Mendapat Kunci pada file, maka hanya An # Indonesian#: source/TortoiseGit_en.xml:7091(para) #. (para) #: ../source/TortoiseGit_en.xml:8954 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." -msgstr "Akan tetapi, pengguna lain tidak perlu mengetahui bahwa Anda telah mengambil kunci. Kecuali mereka memeriksa status kunci secara reguler, pertama mereka akan mengetahuinya ketika komit mereka gagal, yang dalam banyak akasus tidak begitu berguna. Untuk memudahkan pengaturan kunci, ada properti baru Subversion svn:needs-lock. Bila properti ini di-set (ke nilai apapun) pada file, kapan saja filedi check out atau dimutahirkan, copy lokal dibuat hanya-baca kecuali copy pekerjaan itu menampung kuncian untuk file. Tindakan ini sebagai peringatan bahwa Anda tidak boleh mengedit file itu kecuali Anda mendapatkan kunci yang dibutuhkan. File yang diversi dan hanya-baca ditandai dengan lapisan khusus dalam TortoiseGit untuk menunjukan bahwa Anda perlu mendapatkan kunci sebelum pengeditan." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgstr "Akan tetapi, pengguna lain tidak perlu mengetahui bahwa Anda telah mengambil kunci. Kecuali mereka memeriksa status kunci secara reguler, pertama mereka akan mengetahuinya ketika komit mereka gagal, yang dalam banyak akasus tidak begitu berguna. Untuk memudahkan pengaturan kunci, ada properti baru Git svn:needs-lock. Bila properti ini di-set (ke nilai apapun) pada file, kapan saja filedi check out atau dimutahirkan, copy lokal dibuat hanya-baca kecuali copy pekerjaan itu menampung kuncian untuk file. Tindakan ini sebagai peringatan bahwa Anda tidak boleh mengedit file itu kecuali Anda mendapatkan kunci yang dibutuhkan. File yang diversi dan hanya-baca ditandai dengan lapisan khusus dalam TortoiseGit untuk menunjukan bahwa Anda perlu mendapatkan kunci sebelum pengeditan." # Indonesian#: source/TortoiseGit_en.xml:7108(para) #. (para) @@ -8690,8 +8690,8 @@ msgstr "Kuncian direkam oleh lokasi copy pekerjaan juga oleh pemilik. Jika Anda # Indonesian#: source/TortoiseGit_en.xml:7114(para) #. (para) #: ../source/TortoiseGit_en.xml:8976 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." -msgstr "Jika salah satu dari co-worker Anda memerlukan kunci dan kemudian pergi berlibur tanpa melepaskannya, apa yang Anda lakukan? Subversion menyediakan dalam artian untuk memaksa kuncian. Pelepasan kunci yang dipegang oleh orang lain dirujuk sebagai Membongkar kunci, dan dipaksa untuk mendapatkan kunci yang sudah dipegang orang lain dirujuk sebagai Pencurian kunci. Umumnya ini bukan hal yang harus Anda lakukan jika Anda ingin tetap berteman dengan co-worker Anda." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgstr "Jika salah satu dari co-worker Anda memerlukan kunci dan kemudian pergi berlibur tanpa melepaskannya, apa yang Anda lakukan? Git menyediakan dalam artian untuk memaksa kuncian. Pelepasan kunci yang dipegang oleh orang lain dirujuk sebagai Membongkar kunci, dan dipaksa untuk mendapatkan kunci yang sudah dipegang orang lain dirujuk sebagai Pencurian kunci. Umumnya ini bukan hal yang harus Anda lakukan jika Anda ingin tetap berteman dengan co-worker Anda." # Indonesian#: source/TortoiseGit_en.xml:7124(para) #. (para) @@ -8775,8 +8775,8 @@ msgstr "Hindari Pembongkaran dan Pencurian Kunci" # Indonesian#: source/TortoiseGit_en.xml:7220(para) #. (para) #: ../source/TortoiseGit_en.xml:9077 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." -msgstr "Jika Anda membongkar atau mencuri kunci orang lain tanpa memberitahunya, Anda bisa menyebabkan kehiilangan pekerjaan. Jika Anda bekerja dengan tipe file tidak bisa digabung dan Anda mencuri kunci orang lain, sekali Anda melepaskan kunci mereka bebas memeriksanya dalam perubahan mereka dan menimpa punya Anda. Subversion tidak kehilangan data, tapi Anda kehilangan proteksi tim-kerja yang memberikan kunci kepada Anda." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." +msgstr "Jika Anda membongkar atau mencuri kunci orang lain tanpa memberitahunya, Anda bisa menyebabkan kehiilangan pekerjaan. Jika Anda bekerja dengan tipe file tidak bisa digabung dan Anda mencuri kunci orang lain, sekali Anda melepaskan kunci mereka bebas memeriksanya dalam perubahan mereka dan menimpa punya Anda. Git tidak kehilangan data, tapi Anda kehilangan proteksi tim-kerja yang memberikan kunci kepada Anda." # Indonesian#: source/TortoiseGit_en.xml:7233(title) #. (title) @@ -8794,8 +8794,8 @@ msgstr "Seperti telah disebutkan diatas, cara yang paling efektif untuk mengguna #. (para) #: ../source/TortoiseGit_en.xml:9100 #, fuzzy -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." -msgstr "Jika Anda mengoperasikan aturan dimana setiap file harus dikunci lalu Anda bisa menemukannya lebih mudah untuk menggunakan fitur auto-props Subversion untuk mengeset properti secara otomatis setiap kali Anda menambah file. Baca selengkapnya ." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgstr "Jika Anda mengoperasikan aturan dimana setiap file harus dikunci lalu Anda bisa menemukannya lebih mudah untuk menggunakan fitur auto-props Git untuk mengeset properti secara otomatis setiap kali Anda menambah file. Baca selengkapnya ." # Indonesian#: source/TortoiseGit_en.xml:7256(title) #. (title) @@ -8806,8 +8806,8 @@ msgstr "Naskah Hook Penguncian" # Indonesian#: source/TortoiseGit_en.xml:7257(para) #. (para) #: ../source/TortoiseGit_en.xml:9110 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." -msgstr "Ketika Anda membuat repositori baru dengan Subversion 1.2 atau lebih tinggi, empat template hook dibuat dalam direktori repositori hooks. Ini disebut sebelum dan setelah mendapatkan kunci, dan sebelum serta setelah melepaskan kunci." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgstr "Ketika Anda membuat repositori baru dengan Git 1.2 atau lebih tinggi, empat template hook dibuat dalam direktori repositori hooks. Ini disebut sebelum dan setelah mendapatkan kunci, dan sebelum serta setelah melepaskan kunci." # Indonesian#: source/TortoiseGit_en.xml:7263(para) #. (para) @@ -9598,8 +9598,8 @@ msgstr "" # Indonesian#: source/TortoiseGit_en.xml:7792(para) #. (para) #: ../source/TortoiseGit_en.xml:9958 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." -msgstr "Karena Subversion tidak bisa menyediakan semua informasi yang dibutuhkan, jumlah tertentu dari interpretasi dibutuhkan, yang kadang-kadang bisa memberikan hasil aneh. Meskipun demikian, output untuk trunk akan membuat memberikan hasil yang berguna." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgstr "Karena Git tidak bisa menyediakan semua informasi yang dibutuhkan, jumlah tertentu dari interpretasi dibutuhkan, yang kadang-kadang bisa memberikan hasil aneh. Meskipun demikian, output untuk trunk akan membuat memberikan hasil yang berguna." #. (para) #: ../source/TortoiseGit_en.xml:9968 @@ -9614,8 +9614,8 @@ msgstr "" # Indonesian#: source/TortoiseGit_en.xml:7801(title) #. (title) #: ../source/TortoiseGit_en.xml:9987 -msgid "Exporting a Subversion Working Copy" -msgstr "Mengekspor suatu Copy Pekerjaan Subversion" +msgid "Exporting a Git Working Copy" +msgstr "Mengekspor suatu Copy Pekerjaan Git" # Indonesian#: source/TortoiseGit_en.xml:7803(primary) #. (primary) @@ -9676,11 +9676,11 @@ msgstr "Saat mengekspor dari suatu copy pekerjaan, jika folder target sudah meng #: ../source/TortoiseGit_en.xml:10061 #, fuzzy msgid "Exporting single files" -msgstr "Properti Subversion" +msgstr "Properti Git" #. (para) #: ../source/TortoiseGit_en.xml:10062 -msgid "The export dialog does not allow exporting single files, even though Subversion can." +msgid "The export dialog does not allow exporting single files, even though Git can." msgstr "" #. (para) @@ -9792,8 +9792,8 @@ msgstr "Ini adalah operasi yang sangat jarang digunakan. Pe # Indonesian#: source/TortoiseGit_en.xml:7899(para) #. (para) #: ../source/TortoiseGit_en.xml:10156 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." -msgstr "Anda ingin memindahkan repositori Subversion ke lokasi berbeda. Dalam hal itu Anda harus melakukan checkout bersih dari lokasi repositori baru." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." +msgstr "Anda ingin memindahkan repositori Git ke lokasi berbeda. Dalam hal itu Anda harus melakukan checkout bersih dari lokasi repositori baru." # Indonesian#: source/TortoiseGit_en.xml:7906(para) #. (para) @@ -9850,8 +9850,8 @@ msgstr "pelacakbug" # Indonesian#: source/TortoiseGit_en.xml:7937(para) #. (para) #: ../source/TortoiseGit_en.xml:10196 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." -msgstr "Sudah sangat umum dalam Pengembangan Software untuk perubahan dikaitkan ke ID bug atau isu tertentu. Para pengguna dari sistem pelacakan bug (pelacak isu) ingin mengaitkan perubahan yang mereka lakukan dalam Subversion dengan ID tertentu dalam pelacak isu mereka. Kebanyakan pelacak isu menyediakan naskah hook pre-commit yang mengoper log pesan untuk mencari bug ID dimana komit dikaitkan. Ini cenderung merupakan kesalahan karena ia tergantung pada pengguna untuk menulis log pesan dengan benar agar naskah hook pre-commit bisa mengurainya dengan benar." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgstr "Sudah sangat umum dalam Pengembangan Software untuk perubahan dikaitkan ke ID bug atau isu tertentu. Para pengguna dari sistem pelacakan bug (pelacak isu) ingin mengaitkan perubahan yang mereka lakukan dalam Git dengan ID tertentu dalam pelacak isu mereka. Kebanyakan pelacak isu menyediakan naskah hook pre-commit yang mengoper log pesan untuk mencari bug ID dimana komit dikaitkan. Ini cenderung merupakan kesalahan karena ia tergantung pada pengguna untuk menulis log pesan dengan benar agar naskah hook pre-commit bisa mengurainya dengan benar." # Indonesian#: source/TortoiseGit_en.xml:7951(para) #. (para) @@ -10065,15 +10065,15 @@ msgstr "Untuk properti tsvn: Anda hanya #. (para) #: ../source/TortoiseGit_en.xml:10500 -msgid "Because the issue tracker integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:8180(para) #. (para) #: ../source/TortoiseGit_en.xml:10507 #, fuzzy -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." -msgstr "Integrasi pelacak isu ini tidak terbatas pada TortoiseGit; ia bisa digunakan dengan setiap klien Subversion. Untuk informasi lebih jauh, baca Spesifikasi Integrgasi Issuetracker secar lengkap ." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgstr "Integrasi pelacak isu ini tidak terbatas pada TortoiseGit; ia bisa digunakan dengan setiap klien Git. Untuk informasi lebih jauh, baca Spesifikasi Integrgasi Issuetracker secar lengkap ." #. (title) #: ../source/TortoiseGit_en.xml:10518 @@ -10131,8 +10131,8 @@ msgstr "WebSVN" #. (para) #: ../source/TortoiseGit_en.xml:10570 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." -msgstr "Ada beberapa pelihat repositori berbasis web yang dapat digunakan bersama Subversion seperti ViewVC dan WebSVN. TortoiseGit menyediakan sarana untuk menyambung dengan pelihat-pelihat tersebut." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgstr "Ada beberapa pelihat repositori berbasis web yang dapat digunakan bersama Git seperti ViewVC dan WebSVN. TortoiseGit menyediakan sarana untuk menyambung dengan pelihat-pelihat tersebut." # Indonesian#: source/TortoiseGit_en.xml:7971(para) #. (para) @@ -10197,8 +10197,8 @@ msgstr "Dialog Seting, Halaman Umum" # Indonesian#: source/TortoiseGit_en.xml:8204(para) #. (para) #: ../source/TortoiseGit_en.xml:10683 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." -msgstr " Dialog ini membolehkan Anda untuk menetapkan bahasa yang diinginkan, dan seting Subversion-tertentu." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." +msgstr " Dialog ini membolehkan Anda untuk menetapkan bahasa yang diinginkan, dan seting Git-tertentu." # Indonesian#: source/TortoiseGit_en.xml:8214(term) #. (term) @@ -10281,14 +10281,14 @@ msgstr "Pola abaikan global digunakan untuk menjaga file tidak berversi muncul c # Indonesian#: source/TortoiseGit_en.xml:8284(para) #. (para) #: ../source/TortoiseGit_en.xml:10765 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." -msgstr "Catatan bahwa pola abaikan yang Anda tetapkan disini juga akan mempengaruhi klien Subversion lain yang berjalan pada PC Anda, termasuk klien baris perintah." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." +msgstr "Catatan bahwa pola abaikan yang Anda tetapkan disini juga akan mempengaruhi klien Git lain yang berjalan pada PC Anda, termasuk klien baris perintah." # Indonesian#: source/TortoiseGit_en.xml:8290(para) #. (para) #: ../source/TortoiseGit_en.xml:10771 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." -msgstr "Jika Anda menggunakan file konfigurasi Subversion untuk mengeset pola abaikan-global, ia akan menimpa seting yang Anda buat disini. File konfigurasi Subversion diakses menggunakan Edit seperti dijelaskan dibawah." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." +msgstr "Jika Anda menggunakan file konfigurasi Git untuk mengeset pola abaikan-global, ia akan menimpa seting yang Anda buat disini. File konfigurasi Git diakses menggunakan Edit seperti dijelaskan dibawah." # Indonesian#: source/TortoiseGit_en.xml:8298(para) #. (para) @@ -10313,15 +10313,15 @@ msgstr "Opsi ini memberitahu TortoiseGit untuk mengeset tanggal file ke waktu ko # Indonesian#: source/TortoiseGit_en.xml:8326(term) #. (term) #: ../source/TortoiseGit_en.xml:10807 -msgid "Subversion configuration file" -msgstr "File konfigurasi Subversion" +msgid "Git configuration file" +msgstr "File konfigurasi Git" # Indonesian#: source/TortoiseGit_en.xml:8328(para) #. (para) #: ../source/TortoiseGit_en.xml:10809 #, fuzzy -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." -msgstr "Gunakan Edit untuk mengedit file konfigurasi Subversion secara langsung. Beberapa seting tidak bisa dimodifikasi secara langsung oleh TortoiseGit, dan sebaliknya perlu di-set disini. Untuk informasi lebih jauh mengenai file konfig Subversion lihat Runtime Configuration Area. Bagian Automatic Property Setting adalah bagian yang menarik, dan itulah yang dikonfigurasi disini. Catatan bahwa Subversion bisa membaca informasi konfigurasi dari beberapa tempat, dan Anda perlu mengetahui yang mana yang menjadi prioritas. Lihat Configuration and the Windows Registry untuk lebih jelasnya." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgstr "Gunakan Edit untuk mengedit file konfigurasi Git secara langsung. Beberapa seting tidak bisa dimodifikasi secara langsung oleh TortoiseGit, dan sebaliknya perlu di-set disini. Untuk informasi lebih jauh mengenai file konfig Git lihat Runtime Configuration Area. Bagian Automatic Property Setting adalah bagian yang menarik, dan itulah yang dikonfigurasi disini. Catatan bahwa Git bisa membaca informasi konfigurasi dari beberapa tempat, dan Anda perlu mengetahui yang mana yang menjadi prioritas. Lihat Configuration and the Windows Registry untuk lebih jelasnya." # Indonesian#: source/TortoiseGit_en.xml:8353(term) #. (term) @@ -10333,14 +10333,14 @@ msgstr "Gunakan direktori \"_svn\" daripada \".svn\"" # Indonesian#: source/TortoiseGit_en.xml:8355(para) #. (para) #: ../source/TortoiseGit_en.xml:10836 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." -msgstr "VS.NET ketika digunakan dengan proyek web tidak bisa menangani folder .svn yang digunakan Subversion untuk menyimpan informasi internalnya. Ini bukan bug dalam Subversion. Bug ada dalam VS.NET dan ekstensi frontpage yang digunakannya. Baca untuk keterangan mengenai isu ini." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgstr "VS.NET ketika digunakan dengan proyek web tidak bisa menangani folder .svn yang digunakan Git untuk menyimpan informasi internalnya. Ini bukan bug dalam Git. Bug ada dalam VS.NET dan ekstensi frontpage yang digunakannya. Baca untuk keterangan mengenai isu ini." # Indonesian#: source/TortoiseGit_en.xml:8363(para) #. (para) #: ../source/TortoiseGit_en.xml:10843 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." -msgstr "Jika Anda ingin mengubah tingkah laku dari Subversion dan TortoiseGit, Anda bisa menggunakan kotak centang ini untuk mengeset variabel lingkungan yang mengontrol ini." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgstr "Jika Anda ingin mengubah tingkah laku dari Git dan TortoiseGit, Anda bisa menggunakan kotak centang ini untuk mengeset variabel lingkungan yang mengontrol ini." # Indonesian#: source/TortoiseGit_en.xml:8368(para) #. (para) @@ -10461,8 +10461,8 @@ msgstr "Otomatis-tutup jika tidak ada konflik menenangkan k # Indonesian#: source/TortoiseGit_en.xml:8692(para) #. (para) #: ../source/TortoiseGit_en.xml:10966 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." -msgstr "Otomatis-tutup jika tidak ada kesalahan selalu menutup dialog bahkan jika ada konflik. Kondisi yang membiarkan dialog terbuka adalah kondisi kesalahan, yang terjadi saat Subversion tidak bisa menyelesaikan tugas. Sebagai contoh, pemutahiran gagal karena server tidak bisa diakses, atau komit gagal karena copy pekerjaan ketinggalan jaman." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgstr "Otomatis-tutup jika tidak ada kesalahan selalu menutup dialog bahkan jika ada konflik. Kondisi yang membiarkan dialog terbuka adalah kondisi kesalahan, yang terjadi saat Git tidak bisa menyelesaikan tugas. Sebagai contoh, pemutahiran gagal karena server tidak bisa diakses, atau komit gagal karena copy pekerjaan ketinggalan jaman." # Indonesian#: source/TortoiseGit_en.xml:8704(term) #. (term) @@ -10912,14 +10912,14 @@ msgstr "Kecualikan Path digunakan untuk memberitahu Tortois # Indonesian#: source/TortoiseGit_en.xml:8566(para) #. (para) #: ../source/TortoiseGit_en.xml:11380 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "f:\\development\\SVN\\Subversion akan mematikan lapisan hanya pada folder tertentu. Anda masih bisa melihat lapisan pada semua file dan folder di dalam folder itu." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "f:\\development\\SVN\\Git akan mematikan lapisan hanya pada folder tertentu. Anda masih bisa melihat lapisan pada semua file dan folder di dalam folder itu." # Indonesian#: source/TortoiseGit_en.xml:8571(para) #. (para) #: ../source/TortoiseGit_en.xml:11385 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "f:\\development\\SVN\\Subversion* akan mematikan lapisan pada semua file dan folder yang path-nya dimulai dengan f:\\development\\SVN\\Subversion. Itu berarti Anda tidak akan melihat lapisan untuk setiap file dan folder dibawah path." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "f:\\development\\SVN\\Git* akan mematikan lapisan pada semua file dan folder yang path-nya dimulai dengan f:\\development\\SVN\\Git. Itu berarti Anda tidak akan melihat lapisan untuk setiap file dan folder dibawah path." # Indonesian#: source/TortoiseGit_en.xml:8578(para) #. (para) @@ -11023,8 +11023,8 @@ msgstr " Disini Anda bisa mengkonfigurasi server proxy Anda, jik #. (para) #: ../source/TortoiseGit_en.xml:11487 #, fuzzy -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." -msgstr "Disini Anda perlu menyiapkan seting proxy per-repositori, Anda akan perlu untuk menggunakan file server Subversion untuk mengkonfigurasinya. Gunakan Edit untuk [pergi kesana secara langsung. Lihat Runtime Configuration Area untuk perincian bagaimana menggunakan file ini." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgstr "Disini Anda perlu menyiapkan seting proxy per-repositori, Anda akan perlu untuk menggunakan file server Git untuk mengkonfigurasinya. Gunakan Edit untuk [pergi kesana secara langsung. Lihat Runtime Configuration Area untuk perincian bagaimana menggunakan file ini." # Indonesian#: source/TortoiseGit_en.xml:8955(para) #. (para) @@ -11055,7 +11055,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11532 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:8975(title) @@ -11165,7 +11165,7 @@ msgstr "Jika Anda menggunakan properti svn:keywords melebarka #. (para) #: ../source/TortoiseGit_en.xml:11648 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:4643(para) @@ -11373,8 +11373,8 @@ msgstr "Data otentikasi" # Indonesian#: source/TortoiseGit_en.xml:9271(para) #. (para) #: ../source/TortoiseGit_en.xml:11881 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" -msgstr "Ketika Anda mengotentikasi dengan server Subversion, nama pengguna dan kata sandi disimpan secara lokal agar Anda tidak harus tetap memasukannya. Anda mungkin ingin membersihkan ini untuk alasan keamanan, atau karena Anda ingin mengakses repositori dibawah nama pengguna yang berbeda ... apakah John tahu Anda menggunakan PCnya?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgstr "Ketika Anda mengotentikasi dengan server Git, nama pengguna dan kata sandi disimpan secara lokal agar Anda tidak harus tetap memasukannya. Anda mungkin ingin membersihkan ini untuk alasan keamanan, atau karena Anda ingin mengakses repositori dibawah nama pengguna yang berbeda ... apakah John tahu Anda menggunakan PCnya?" # Indonesian#: source/TortoiseGit_en.xml:9279(para) #. (para) @@ -11646,8 +11646,8 @@ msgstr "Dialog Seting, Halaman Naskah Hook" #. (para) #: ../source/TortoiseGit_en.xml:12122 #, fuzzy -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." -msgstr " Dialog ini membolehkan Anda untuk menetapkan bahasa yang diinginkan, dan seting Subversion-tertentu." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgstr " Dialog ini membolehkan Anda untuk menetapkan bahasa yang diinginkan, dan seting Git-tertentu." #. (para) #: ../source/TortoiseGit_en.xml:12132 @@ -11733,8 +11733,8 @@ msgstr "Pre-mutahirkan" #. (para) #: ../source/TortoiseGit_en.xml:12193 -msgid "Called before the actual Subversion update begins." -msgstr "Dipanggil sebelum pemutahiran Subversion yang sesungguhnya dimulai." +msgid "Called before the actual Git update begins." +msgstr "Dipanggil sebelum pemutahiran Git yang sesungguhnya dimulai." # Indonesian#: source/TortoiseGit_en.xml:4084(primary) source/TortoiseGit_en.xml:9775(primary) #. (term) @@ -11851,8 +11851,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12371 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." -msgstr "Jika Anda ingin operasi Subversion ditunda sampai hook telah selesai, cawang Menunggu naskah diselesaikan." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." +msgstr "Jika Anda ingin operasi Git ditunda sampai hook telah selesai, cawang Menunggu naskah diselesaikan." #. (para) #: ../source/TortoiseGit_en.xml:12375 @@ -11972,8 +11972,8 @@ msgstr "Beberapa seting yang jarang digunakan tersedia hanya dengan mengedit reg # Indonesian#: source/TortoiseGit_en.xml:9301(para) #. (para) #: ../source/TortoiseGit_en.xml:12498 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." -msgstr "Anda bisa menetapkan lokasi berbeda untuk file konfigurasi Subversion menggunakan lokasi registri HKCU\\Software\\TortoiseGit\\ConfigDir. Ini akan mempengaruhi semua operasi TortoiseGit." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgstr "Anda bisa menetapkan lokasi berbeda untuk file konfigurasi Git menggunakan lokasi registri HKCU\\Software\\TortoiseGit\\ConfigDir. Ini akan mempengaruhi semua operasi TortoiseGit." # Indonesian#: source/TortoiseGit_en.xml:9310(term) #. (term) @@ -12043,8 +12043,8 @@ msgstr "" # Indonesian#: source/TortoiseGit_en.xml:9324(title) #. (title) #: ../source/TortoiseGit_en.xml:12588 -msgid "Subversion Working Folders" -msgstr "Folder Pekerjaan Subversion" +msgid "Git Working Folders" +msgstr "Folder Pekerjaan Git" # Indonesian#: source/TortoiseGit_en.xml:9326(primary) #. (primary) @@ -12062,8 +12062,8 @@ msgstr "folder _svn" #. (para) #: ../source/TortoiseGit_en.xml:12595 #, fuzzy -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." -msgstr "VS.NET ketika digunakan dengan proyek web tidak bisa menangani folder .svn yang digunakan Subversion untuk menyimpan informasi internalnya. Ini bukan bug dalam Subversion. Bug ada dalam VS.NET dan ekstensi frontpage yang digunakannya." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgstr "VS.NET ketika digunakan dengan proyek web tidak bisa menangani folder .svn yang digunakan Git untuk menyimpan informasi internalnya. Ini bukan bug dalam Git. Bug ada dalam VS.NET dan ekstensi frontpage yang digunakannya." #. (para) #: ../source/TortoiseGit_en.xml:12602 @@ -12074,8 +12074,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12606 #, fuzzy -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." -msgstr "Sejak Versi 1.3.0 dari Subversion dan TortoiseGit, Anda bisa mengeset variabel lingkungan SVN_ASP_DOT_NET_HACK. Jika variabel itu di-set, maka Subversion akan menggunakan folder _svn daripada folder .svn. Anda harus memulai lagi shell Anda untuk variabel env itu agar bekerja. Biasanya itu berarti me-reboot PC Anda. Untuk memudahkan ini, Anda sekarang bisa melakukan ini dari halaman seting umum menggunakan kotak centang sederhana - lihat ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgstr "Sejak Versi 1.3.0 dari Git dan TortoiseGit, Anda bisa mengeset variabel lingkungan SVN_ASP_DOT_NET_HACK. Jika variabel itu di-set, maka Git akan menggunakan folder _svn daripada folder .svn. Anda harus memulai lagi shell Anda untuk variabel env itu agar bekerja. Biasanya itu berarti me-reboot PC Anda. Untuk memudahkan ini, Anda sekarang bisa melakukan ini dari halaman seting umum menggunakan kotak centang sederhana - lihat ." # Indonesian#: source/TortoiseGit_en.xml:9347(para) #. (para) @@ -12135,13 +12135,13 @@ msgstr "COM" #: ../source/TortoiseGit_en.xml:12665 #, fuzzy msgid "version number in files" -msgstr "File konfigurasi Subversion" +msgstr "File konfigurasi Git" # Indonesian#: source/TortoiseGit_en.xml:9390(para) #. (para) #: ../source/TortoiseGit_en.xml:12667 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." -msgstr "SubWCRev adalah program konsol Windows yang bisa digunakan untuk membaca status dari copy pekerjaan Subversion dan secara opsional melakukan substitusi kata kunci dalam file template. Ini sering dipakai sebagai bagian dari proses pembangunan dalam arti menyertakan informasi copy pekerjaan ke dalam obyek yang sedang Anda bangun. Biasanya mungkin digunakan untuk menyertakan angka revisi dalam kotak Tentang." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgstr "SubWCRev adalah program konsol Windows yang bisa digunakan untuk membaca status dari copy pekerjaan Git dan secara opsional melakukan substitusi kata kunci dalam file template. Ini sering dipakai sebagai bagian dari proses pembangunan dalam arti menyertakan informasi copy pekerjaan ke dalam obyek yang sedang Anda bangun. Biasanya mungkin digunakan untuk menyertakan angka revisi dalam kotak Tentang." # Indonesian#: source/TortoiseGit_en.xml:9404(title) #. (title) @@ -12152,8 +12152,8 @@ msgstr "Baris Perintah SubWCRev" # Indonesian#: source/TortoiseGit_en.xml:9405(para) #. (para) #: ../source/TortoiseGit_en.xml:12682 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." -msgstr "SubWCRev membaca status semua file Subversion dalam copy pekerjaan, mengecualikan eksternal standarnya. Ia merekam angka revisi komit tertinggi yang ditemukan, dan cap waktu komit dari revisi itu, Ia juga merekam apakah ada modifikasi lokal dalam copy pekerjaan, atau revisi pemutahiran campuran. Angka revisi, deretan revisi pemutahiran dan status modifikasi ditampilkan pada stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgstr "SubWCRev membaca status semua file Git dalam copy pekerjaan, mengecualikan eksternal standarnya. Ia merekam angka revisi komit tertinggi yang ditemukan, dan cap waktu komit dari revisi itu, Ia juga merekam apakah ada modifikasi lokal dalam copy pekerjaan, atau revisi pemutahiran campuran. Angka revisi, deretan revisi pemutahiran dan status modifikasi ditampilkan pada stdout." # Indonesian#: source/TortoiseGit_en.xml:9414(para) #. (para) @@ -12729,7 +12729,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12996 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " msgstr "" #. (programlisting) @@ -12884,8 +12884,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13202 #, fuzzy -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "Karena TortoiseGit sedang dikembangkan terus menerus ada kalanya sulit untuk memelihara dokumentasi sepenuhnya mutahir. Kami memelihara FAQ online interaktif yang berisi pilihan pertanyaan yang diajukan paling banyak kepada kami pada daftar mailing TortoiseGit dev@TortoiseGit.tigris.org dan users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "Karena TortoiseGit sedang dikembangkan terus menerus ada kalanya sulit untuk memelihara dokumentasi sepenuhnya mutahir. Kami memelihara FAQ online interaktif yang berisi pilihan pertanyaan yang diajukan paling banyak kepada kami pada daftar mailing TortoiseGit tortoisegit-dev@googlegroups.com dan tortoisegit-users@googlegroups.com ." # Indonesian#: source/TortoiseGit_en.xml:9653(para) #. (para) @@ -12896,7 +12896,7 @@ msgstr "Kami juga memelihara users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." msgstr "" # Indonesian#: source/TortoiseGit_en.xml:9675(title) @@ -12939,7 +12939,7 @@ msgstr "Memindahkan/Mengcopy satu file bisa dilakukan dengan menggunakan right-dragging the files to the new location. Simply right-click on the files you want to move/copy without releasing the mouse button. Then drag the files to the new location and release the mouse button. A context menu will appear where you can either choose Context MenuSVN Copy versioned files here. or Context MenuSVN Move versioned files here." -msgstr "Cara yang direkomendasikan adalah dengan mendrag-kanan file- file ke lokasi baru. Cukup klik-kanan pada file yang ingin Anda pindah/copy tanpa melepas tombol mouse. Lalu tarik file ke lokasi baru dan lepaskan tombol mouse. Menu konteks akan muncul dimana Anda bisa memilih Menu KonteksCopy dalam Subversion kesini. atau Menu KonteksPindahkan Subversion kesini." +msgstr "Cara yang direkomendasikan adalah dengan mendrag-kanan file- file ke lokasi baru. Cukup klik-kanan pada file yang ingin Anda pindah/copy tanpa melepas tombol mouse. Lalu tarik file ke lokasi baru dan lepaskan tombol mouse. Menu konteks akan muncul dimana Anda bisa memilih Menu KonteksCopy dalam Git kesini. atau Menu KonteksPindahkan Git kesini." # Indonesian#: source/TortoiseGit_en.xml:9718(title) #. (title) @@ -12970,8 +12970,8 @@ msgstr "log pesan" # Indonesian#: source/TortoiseGit_en.xml:9722(para) #. (para) #: ../source/TortoiseGit_en.xml:13305 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." -msgstr "Ada dua cara untuk menjaga pengguna dari mengkomit dengan pesan log kosong. Pertama adalah spesifik bagi TortoiseGit, yang lain bekerja untuk semua klien Subversion, tapi memerlukan akses ke server secara langsung." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." +msgstr "Ada dua cara untuk menjaga pengguna dari mengkomit dengan pesan log kosong. Pertama adalah spesifik bagi TortoiseGit, yang lain bekerja untuk semua klien Git, tapi memerlukan akses ke server secara langsung." # Indonesian#: source/TortoiseGit_en.xml:9729(title) #. (title) @@ -12995,8 +12995,8 @@ msgstr "Dalam folder repositori pada server, ada subfolder hooksOK button disabled until the log message is long enough then please use the method described below." -msgstr "Metode ini adalah cara yang direkomendasikan jika pengguna Anda juga menggunakan klien Subversion lain daripada TortoiseGit. Akibatnya adalah komit ditolak oleh server dan karenanya pengguna akan mendapatkan pesan kesalahan, Klien tidak bisa mengetahui sebelum komit yang akan ditolak. Jika Anda ingin membuat TortoiseGit mempunyai tombol OK dimatikan sampai pesan log cukup panjang lalu silahkan gunakan metode yang dijelaskan di atas." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgstr "Metode ini adalah cara yang direkomendasikan jika pengguna Anda juga menggunakan klien Git lain daripada TortoiseGit. Akibatnya adalah komit ditolak oleh server dan karenanya pengguna akan mendapatkan pesan kesalahan, Klien tidak bisa mengetahui sebelum komit yang akan ditolak. Jika Anda ingin membuat TortoiseGit mempunyai tombol OK dimatikan sampai pesan log cukup panjang lalu silahkan gunakan metode yang dijelaskan di atas." # Indonesian#: source/TortoiseGit_en.xml:9755(title) #. (title) @@ -13181,8 +13181,8 @@ msgstr "Karena TortoiseGit tidak pernah kehilangan data, revisi yang di-r #. (para) #: ../source/TortoiseGit_en.xml:13528 #, fuzzy -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." -msgstr "Satu-satunya cara untuk menghapus data dari repositori adalah menggunakan piranti baris perintah Subversion svnadmin. Anda bisa menemukan penjelasan bagaimana ini bekerja dalam Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgstr "Satu-satunya cara untuk menghapus data dari repositori adalah menggunakan piranti baris perintah Git svnadmin. Anda bisa menemukan penjelasan bagaimana ini bekerja dalam Repository Maintenance." # Indonesian#: source/TortoiseGit_en.xml:9948(title) #. (title) @@ -13262,8 +13262,8 @@ msgstr "Set properti svn:externals untuk folder dalam proyek #. (para) #: ../source/TortoiseGit_en.xml:13622 #, fuzzy -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." -msgstr "Komit folder baru. Sekarang ketika Anda memutahirkan, Subversion akan menarik copy proyek itu dari repositorinya ke dalam copy pekerjaan Anda. Subfolder akan diperlakukan otomatis jika diperlukan. Setiap kali Anda memutahirkan copy pekerjaan utama Anda, Anda juga akan menerima versi terbaru dari semua proyek eksternal." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgstr "Komit folder baru. Sekarang ketika Anda memutahirkan, Git akan menarik copy proyek itu dari repositorinya ke dalam copy pekerjaan Anda. Subfolder akan diperlakukan otomatis jika diperlukan. Setiap kali Anda memutahirkan copy pekerjaan utama Anda, Anda juga akan menerima versi terbaru dari semua proyek eksternal." #. (para) #: ../source/TortoiseGit_en.xml:13641 @@ -13279,8 +13279,8 @@ msgstr "Gunakan copy pekerjaan berulang" # Indonesian#: source/TortoiseGit_en.xml:10047(para) #. (para) #: ../source/TortoiseGit_en.xml:13650 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" -msgstr "Buat folder baru dalam proyek Anda untuk diisi kode umum, tapi jangan tambahkan ke Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" +msgstr "Buat folder baru dalam proyek Anda untuk diisi kode umum, tapi jangan tambahkan ke Git" # Indonesian#: source/TortoiseGit_en.xml:10051(para) #. (para) @@ -13958,8 +13958,8 @@ msgstr "Karena semua perintah TortoiseGit dikontrol melalui parameter baris peri # Indonesian#: source/TortoiseGit_en.xml:10353(para) #. (para) #: ../source/TortoiseGit_en.xml:14157 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." -msgstr "Ingat bahwa TortoiseGit adalah klien GUI, dan petunjuk otomasi ini memperlihatkan kepada Anda bagaimana untuk membuat dialog TortoiseGit muncul untuk mengumpulkan input pengguna. Jika Anda ingin menulis naskah yang tidak memerlukan input, sebaliknya Anda harus menggunakan klien baris perintah Subversion resmi." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." +msgstr "Ingat bahwa TortoiseGit adalah klien GUI, dan petunjuk otomasi ini memperlihatkan kepada Anda bagaimana untuk membuat dialog TortoiseGit muncul untuk mengumpulkan input pengguna. Jika Anda ingin menulis naskah yang tidak memerlukan input, sebaliknya Anda harus menggunakan klien baris perintah Git resmi." # Indonesian#: source/TortoiseGit_en.xml:10366(title) source/TortoiseGit_en.xml:10801(title) #. (title) @@ -14672,21 +14672,21 @@ msgstr "CLI" # Indonesian#: source/TortoiseGit_en.xml:10753(para) #. (para) #: ../source/TortoiseGit_en.xml:14751 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." -msgstr "Kadang-kadang manual ini mengarahkan Anda ke dokumentasi Subversion utama, yang menjelaskan Subversion dalam batas Interface Baris Perintah (CLI). Untuk membantu Anda mengerti apa yang dilakukan TortoiseGit dibelakang layar, kami telah mengompilasi daftar yang memperlihatkan perintah mirip CLI untuk setiap operasi GUI dari TortoiseGit." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgstr "Kadang-kadang manual ini mengarahkan Anda ke dokumentasi Git utama, yang menjelaskan Git dalam batas Interface Baris Perintah (CLI). Untuk membantu Anda mengerti apa yang dilakukan TortoiseGit dibelakang layar, kami telah mengompilasi daftar yang memperlihatkan perintah mirip CLI untuk setiap operasi GUI dari TortoiseGit." # Indonesian#: source/TortoiseGit_en.xml:10762(para) #. (para) #: ../source/TortoiseGit_en.xml:14760 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." -msgstr "Meskipun ada yang mirip CLI terhadap apa yang dilakukan TortoiseGit, ingat bahwa TortoiseGit tidak memanggil CLI tapi menggunakan librari Subversion secara langsung." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." +msgstr "Meskipun ada yang mirip CLI terhadap apa yang dilakukan TortoiseGit, ingat bahwa TortoiseGit tidak memanggil CLI tapi menggunakan librari Git secara langsung." # Indonesian#: source/TortoiseGit_en.xml:10768(para) #. (para) #: ../source/TortoiseGit_en.xml:14766 #, fuzzy -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." -msgstr "Jika Anda berpikir telah menemukan bug dalam TortoiseGit, kami mungkin meminta Anda untuk mencoba membuat ulang menggunakan CLI, agar kami bisa membedakan isu TSVN dari isu Subversion. Referensi ini memberitahu Anda perintah mana yang dicoba." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." +msgstr "Jika Anda berpikir telah menemukan bug dalam TortoiseGit, kami mungkin meminta Anda untuk mencoba membuat ulang menggunakan CLI, agar kami bisa membedakan isu TSVN dari isu Git. Referensi ini memberitahu Anda perintah mana yang dicoba." # Indonesian#: source/TortoiseGit_en.xml:10776(title) #. (title) @@ -14760,8 +14760,8 @@ msgstr "" # Indonesian#: source/TortoiseGit_en.xml:10826(para) #. (para) #: ../source/TortoiseGit_en.xml:14824 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." -msgstr "Memutahirkan item-item multipel yang saat ini bukan operasi atomik dalam Subversion. Maka pertama TortoiseGit mencari revisi HEAD dari repositori, dan kemudian memutahirkan semua item ke angka revisi tertentu untuk menghindari pembuatan revisi dari copy pekerjaan." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgstr "Memutahirkan item-item multipel yang saat ini bukan operasi atomik dalam Git. Maka pertama TortoiseGit mencari revisi HEAD dari repositori, dan kemudian memutahirkan semua item ke angka revisi tertentu untuk menghindari pembuatan revisi dari copy pekerjaan." # Indonesian#: source/TortoiseGit_en.xml:10833(para) #. (para) @@ -14803,8 +14803,8 @@ msgstr "Jika Hanya memutahirkan folder atas dicentang, guna # Indonesian#: source/TortoiseGit_en.xml:10861(para) #. (para) #: ../source/TortoiseGit_en.xml:14859 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." -msgstr "Dalam TortoiseGit, dialog komit menggunakan beberapa perintah Subversion. Langkah pertama adalah pemeriksaan status yang memeriksa item-item dalam copy pekerjaan Anda yang bisa berpotensial untuk dikomit. Anda bisa meninjau ulang daftar, diff file terhadap BASE dan memilih item-item yang ingin Anda sertakan dalam komit." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgstr "Dalam TortoiseGit, dialog komit menggunakan beberapa perintah Git. Langkah pertama adalah pemeriksaan status yang memeriksa item-item dalam copy pekerjaan Anda yang bisa berpotensial untuk dikomit. Anda bisa meninjau ulang daftar, diff file terhadap BASE dan memilih item-item yang ingin Anda sertakan dalam komit." # Indonesian#: source/TortoiseGit_en.xml:10869(screen) source/TortoiseGit_en.xml:11033(screen) source/TortoiseGit_en.xml:11062(screen) #. (screen) @@ -14826,8 +14826,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14869 #: ../source/TortoiseGit_en.xml:14957 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." -msgstr "Jika Tampilkan file tidak berversi dicentang, TortoiseGit juga akan menampilkan file-file dan folder tidak berversi dalam hirarki copy pekerjaan, memperhitungkan aturan pengabaian. Fitur tertentu ini tidak langsung sama dalam Subversion, karena perintah svn status tidak berasal dari folder tidak berversi." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." +msgstr "Jika Tampilkan file tidak berversi dicentang, TortoiseGit juga akan menampilkan file-file dan folder tidak berversi dalam hirarki copy pekerjaan, memperhitungkan aturan pengabaian. Fitur tertentu ini tidak langsung sama dalam Git, karena perintah svn status tidak berasal dari folder tidak berversi." # Indonesian#: source/TortoiseGit_en.xml:10880(para) #. (para) @@ -14851,8 +14851,8 @@ msgstr "" # Indonesian#: source/TortoiseGit_en.xml:10887(para) #. (para) #: ../source/TortoiseGit_en.xml:14884 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." -msgstr "Ketika Anda mengklik OK, komit Subversion dimulai. Jika Anda telah membiarkan semua kotak centang pilihan file dalam keadaan standar, TortoiseGit menggunakan komit rekursif tunggal dari copy pekerjaan. Jika Anda tidak memilih beberapa file, maka komit non-rekursif (-N) harus digunakan, dan setiap path harus ditetapkan secara individual pada baris perintah komit." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgstr "Ketika Anda mengklik OK, komit Git dimulai. Jika Anda telah membiarkan semua kotak centang pilihan file dalam keadaan standar, TortoiseGit menggunakan komit rekursif tunggal dari copy pekerjaan. Jika Anda tidak memilih beberapa file, maka komit non-rekursif (-N) harus digunakan, dan setiap path harus ditetapkan secara individual pada baris perintah komit." # Indonesian#: source/TortoiseGit_en.xml:10895(screen) #. (screen) @@ -15064,8 +15064,8 @@ msgstr "Tahap pertama adalah pemeriksaan status yang memeriksa item dalam copy p # Indonesian#: source/TortoiseGit_en.xml:11042(para) #. (para) #: ../source/TortoiseGit_en.xml:15037 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." -msgstr "Ketika Anda mengklik OK, pemulihan Subversion dimulai. Jika Anda membiarkan kotak centang semua pilihan file dalam keadaan standar, TortoiseGit menggunakan pemulihan rekursif tunggal (-R) dari copy pekerjaan Anda. Jika Anda tidak memilih beberapa file, maka setiap path harus ditetapkan secara individual [pda baris perintah pemulihan." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgstr "Ketika Anda mengklik OK, pemulihan Git dimulai. Jika Anda membiarkan kotak centang semua pilihan file dalam keadaan standar, TortoiseGit menggunakan pemulihan rekursif tunggal (-R) dari copy pekerjaan Anda. Jika Anda tidak memilih beberapa file, maka setiap path harus ditetapkan secara individual [pda baris perintah pemulihan." # Indonesian#: source/TortoiseGit_en.xml:11050(screen) #. (screen) @@ -15239,8 +15239,8 @@ msgstr "Formulir ini digunakan untuk mengakses dari folder tidak berversi, dan f # Indonesian#: source/TortoiseGit_en.xml:11145(para) #. (para) #: ../source/TortoiseGit_en.xml:15139 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." -msgstr "Mengekspor copy pekerjaan ke lokasi berbeda dikerjakan tanpa menggunakan librari Subversion, maka tidak ada persamaan baris perintah." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." +msgstr "Mengekspor copy pekerjaan ke lokasi berbeda dikerjakan tanpa menggunakan librari Git, maka tidak ada persamaan baris perintah." # Indonesian#: source/TortoiseGit_en.xml:11150(para) #. (para) @@ -15370,8 +15370,8 @@ msgstr "TortoiseGit membuat patchfile dalam format unified diff dengan membandin # Indonesian#: source/TortoiseGit_en.xml:11233(para) #. (para) #: ../source/TortoiseGit_en.xml:15225 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." -msgstr "Menerapkan patch adalah urusan sulit kecuali patch dan copy pekerjaan ada pada revisi yang sama. Beruntung bagi Anda, Anda bisa menggunakan TortoiseMerge, yang tidak mempunyai kesamaan dengan Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." +msgstr "Menerapkan patch adalah urusan sulit kecuali patch dan copy pekerjaan ada pada revisi yang sama. Beruntung bagi Anda, Anda bisa menggunakan TortoiseMerge, yang tidak mempunyai kesamaan dengan Git." #. (title) #: ../source/TortoiseGit_en.xml:15239 @@ -15392,7 +15392,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15254 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." msgstr "" #. (para) @@ -15419,12 +15419,12 @@ msgstr " Tanda plus memberitahu An #. (para) #: ../source/TortoiseGit_en.xml:15296 -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15305 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." msgstr "" #. (para) @@ -15444,12 +15444,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15340 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15347 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "" #. (para) @@ -15507,22 +15507,22 @@ msgstr "Mengamankan Svnserve dengan SSH" #. (para) #: ../source/TortoiseGit_en.xml:15417 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15427 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15432 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15438 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" msgstr "" # Indonesian#: source/TortoiseGit_en.xml:1452(title) @@ -15541,7 +15541,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15459 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." msgstr "" #. (para) @@ -15680,7 +15680,7 @@ msgstr "Menguji SSH dengan TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:15622 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "" #. (para) @@ -15789,8 +15789,8 @@ msgstr "Daftar Kata" # Indonesian#: source/TortoiseGit_en.xml:11254(para) #. (para) #: ../source/TortoiseGit_en.xml:15774 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Perintah Subversion yang digunakan untuk menambah file atau direktori ke copy pekerjaan Anda. Item baru ditambahkan ke repositori saat Anda komit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Perintah Git yang digunakan untuk menambah file atau direktori ke copy pekerjaan Anda. Item baru ditambahkan ke repositori saat Anda komit." # Indonesian#: source/TortoiseGit_en.xml:11262(glossterm) #. (glossterm) @@ -15832,27 +15832,27 @@ msgstr "Branch (Cabang)" #. (para) #: ../source/TortoiseGit_en.xml:15816 #, fuzzy -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Batasan yang sering digunakan dalam sistem kontrol revisi untuk menjelaskan apa yang terjadi ketika garpu pengembangan pada titik tertentu dan mengikuti 2 path terpisah. Anda bisas membuat cabang diluar baris pengembangan utama untuk mengembangkan fitur baru tanpa menyerempet barus utama yang tidak stabil. Atau Anda bisa mencabangkan rilis stabil ke mana Anda hanya membuat pembetulan bug, sementara pengembangan baru menempati batang tidak stabil. Dalam Subversion cabang diimplementasikan sebagai copy murah." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Batasan yang sering digunakan dalam sistem kontrol revisi untuk menjelaskan apa yang terjadi ketika garpu pengembangan pada titik tertentu dan mengikuti 2 path terpisah. Anda bisas membuat cabang diluar baris pengembangan utama untuk mengembangkan fitur baru tanpa menyerempet barus utama yang tidak stabil. Atau Anda bisa mencabangkan rilis stabil ke mana Anda hanya membuat pembetulan bug, sementara pengembangan baru menempati batang tidak stabil. Dalam Git cabang diimplementasikan sebagai copy murah." # Indonesian#: source/TortoiseGit_en.xml:11312(para) #. (para) #: ../source/TortoiseGit_en.xml:15831 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Perintah Subversion yang membuat copy pekerjaan lokal dalam direktori kosong dengan mendownload file berversi dari repositori." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Perintah Git yang membuat copy pekerjaan lokal dalam direktori kosong dengan mendownload file berversi dari repositori." # Indonesian#: source/TortoiseGit_en.xml:11321(para) #. (para) #: ../source/TortoiseGit_en.xml:15840 #, fuzzy -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Mengutip dari buku Subversion: Secara rekursif membersihkan copy pekerjaan, menghapus kuncian dan melanjutkan operasi yang belum selesai. Jika Anda pernah mendapatkan kesalahan copy pekerjaan dikunci, jalankan perintah ini untuk menghapus kuncian basi dan mendapatkan copy pekerjaan Anda kedalam kondisi yang berguna lagi. Catatan bahwa konteks kunci merujuk ke penguncian sistem file lokal, bukan penguncian repositori." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Mengutip dari buku Git: Secara rekursif membersihkan copy pekerjaan, menghapus kuncian dan melanjutkan operasi yang belum selesai. Jika Anda pernah mendapatkan kesalahan copy pekerjaan dikunci, jalankan perintah ini untuk menghapus kuncian basi dan mendapatkan copy pekerjaan Anda kedalam kondisi yang berguna lagi. Catatan bahwa konteks kunci merujuk ke penguncian sistem file lokal, bukan penguncian repositori." # Indonesian#: source/TortoiseGit_en.xml:11338(para) #. (para) #: ../source/TortoiseGit_en.xml:15857 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Perintah Subversion ini digunakan untuk mengoper perubahan dalam copy pekerjaan Anda kembali ke dalam repositori, membuat revisi repositori baru." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Perintah Git ini digunakan untuk mengoper perubahan dalam copy pekerjaan Anda kembali ke dalam repositori, membuat revisi repositori baru." # Indonesian#: source/TortoiseGit_en.xml:11346(glossterm) #. (glossterm) @@ -15863,8 +15863,8 @@ msgstr "Conflict (Konflik)" # Indonesian#: source/TortoiseGit_en.xml:11348(para) #. (para) #: ../source/TortoiseGit_en.xml:15867 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Ketika perubahan dari repositori digabung dengan perubahan lokal, ada kalanya perubahan itu terjadi pada baris yang sama. Dalam hal ini Subversion tidak bisa secara otomatis menentukan versi yang mana untuk digunakan dan file yang dinyatakan sebagai konflik. Anda harus mengedit file secara manual dan menyelesaikan konflik sebelum Anda bisa mengkomit perubahan selanjutnya." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Ketika perubahan dari repositori digabung dengan perubahan lokal, ada kalanya perubahan itu terjadi pada baris yang sama. Dalam hal ini Git tidak bisa secara otomatis menentukan versi yang mana untuk digunakan dan file yang dinyatakan sebagai konflik. Anda harus mengedit file secara manual dan menyelesaikan konflik sebelum Anda bisa mengkomit perubahan selanjutnya." # Indonesian#: source/TortoiseGit_en.xml:11359(glossterm) #. (glossterm) @@ -15875,8 +15875,8 @@ msgstr "Copy" # Indonesian#: source/TortoiseGit_en.xml:11361(para) #. (para) #: ../source/TortoiseGit_en.xml:15879 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "Dalam repositori Subversion Anda bisa membuat copy dari file tunggal atau susunan keseluruhan. Ini diimplementasikan sebagai copy murah yang bertindak sedikit mirip link ke original didalamnya hampir tidak ada ruang. Membuat copy menjaga sejarah dari item dalam copy, dengan demikian Anda bisa melacak perubahan yang dibuat sebelum copy dibuat." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "Dalam repositori Git Anda bisa membuat copy dari file tunggal atau susunan keseluruhan. Ini diimplementasikan sebagai copy murah yang bertindak sedikit mirip link ke original didalamnya hampir tidak ada ruang. Membuat copy menjaga sejarah dari item dalam copy, dengan demikian Anda bisa melacak perubahan yang dibuat sebelum copy dibuat." # Indonesian#: source/TortoiseGit_en.xml:11373(para) #. (para) @@ -15907,8 +15907,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15922 #, fuzzy -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "FS Filesystem. Hak milik Subversion filesystem backend untuk repositori. Bisa digunakan pada jaringan berbagi. Standar untuk 1.2 dan repositori lebih baru." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "FS Filesystem. Hak milik Git filesystem backend untuk repositori. Bisa digunakan pada jaringan berbagi. Standar untuk 1.2 dan repositori lebih baru." # Indonesian#: source/TortoiseGit_en.xml:11413(para) #. (para) @@ -15931,8 +15931,8 @@ msgstr "Revisi terbaru dari file atau folder dalam repositoriPatch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Jika copy pekerjaan sudah berubah ke hanya file teks, ini memungkinkan untuk menggunakan perintah Diff Subversion untuk menghasilkan ringkasan file tunggal dari perubahan itu dalam format Unified Diff. File dari tipe ini sering dirujuk sebagai Patch, dan bisa diemail ke orang lain (atau daftar mailing) dan diterapkan ke copy pekerjaan lain. Seseorang tanpa akses komit bisa membuat perubahan dan mengirimkan file patch untuk pengkomit yang diotorisasi untuk menerapkan. Atau jika Anda tidak yakin mengenai perubahan Anda bisa mengirimkan patch untuk ditinjau orang lain." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Jika copy pekerjaan sudah berubah ke hanya file teks, ini memungkinkan untuk menggunakan perintah Diff Git untuk menghasilkan ringkasan file tunggal dari perubahan itu dalam format Unified Diff. File dari tipe ini sering dirujuk sebagai Patch, dan bisa diemail ke orang lain (atau daftar mailing) dan diterapkan ke copy pekerjaan lain. Seseorang tanpa akses komit bisa membuat perubahan dan mengirimkan file patch untuk pengkomit yang diotorisasi untuk menerapkan. Atau jika Anda tidak yakin mengenai perubahan Anda bisa mengirimkan patch untuk ditinjau orang lain." # Indonesian#: source/TortoiseGit_en.xml:11496(glossterm) #. (glossterm) @@ -15998,8 +15998,8 @@ msgstr "Properti" # Indonesian#: source/TortoiseGit_en.xml:11498(para) #. (para) #: ../source/TortoiseGit_en.xml:16015 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Sebagai tambahan ke direktori dan file versi Anda, Subversion membolehkan Anda untuk menambahkan metadata yang diversi - dirujuk sebagai properties ke setiap direktori dan file yang diversi Anda. Setiap properti mempunyai nama dan nilai, mirip kunci registri. Subversion mempunyai beberapa properti khusus yang digunakan secara internal, seperti svn:eol-style. TortoiseGit juga mempunyai beberapa, seperti tsvn:logminsize. Anda bisa menambah properti Anda sendiri dengan setiap nama dan nilai yang Anda pilih." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Sebagai tambahan ke direktori dan file versi Anda, Git membolehkan Anda untuk menambahkan metadata yang diversi - dirujuk sebagai properties ke setiap direktori dan file yang diversi Anda. Setiap properti mempunyai nama dan nilai, mirip kunci registri. Git mempunyai beberapa properti khusus yang digunakan secara internal, seperti svn:eol-style. TortoiseGit juga mempunyai beberapa, seperti tsvn:logminsize. Anda bisa menambah properti Anda sendiri dengan setiap nama dan nilai yang Anda pilih." # Indonesian#: source/TortoiseGit_en.xml:11513(para) #. (para) @@ -16034,8 +16034,8 @@ msgstr "Ketika file dalam copy pekerjaan dibiarkan dalam kondisi konflik mengiku # Indonesian#: source/TortoiseGit_en.xml:11553(para) #. (para) #: ../source/TortoiseGit_en.xml:16070 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion memelihara copy murni lokal dari setiap file seperti setelah saat terakhir Anda memutahirkan copy pekerjaan Anda. Jika Anda telah membuat perubahan dan menentukan Anda ingin membatalkannya, Anda bisa menggunakan perintah pulihkan untuk kembali ke copy murni." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git memelihara copy murni lokal dari setiap file seperti setelah saat terakhir Anda memutahirkan copy pekerjaan Anda. Jika Anda telah membuat perubahan dan menentukan Anda ingin membatalkannya, Anda bisa menggunakan perintah pulihkan untuk kembali ke copy murni." # Indonesian#: source/TortoiseGit_en.xml:11564(para) #. (glossterm) @@ -16076,14 +16076,14 @@ msgstr "SVN" # Indonesian#: source/TortoiseGit_en.xml:11594(para) #. (para) #: ../source/TortoiseGit_en.xml:16111 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Sering-digunakan kependekan dari Subversion." +msgid "A frequently-used abbreviation for Git." +msgstr "Sering-digunakan kependekan dari Git." # Indonesian#: source/TortoiseGit_en.xml:11597(para) #. (para) #: ../source/TortoiseGit_en.xml:16114 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Nama dari protokol bebas Subversion yang digunakan oleh server repositori svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Nama dari protokol bebas Git yang digunakan oleh server repositori svnserve." # Indonesian#: source/TortoiseGit_en.xml:11606(para) #. (para) @@ -16094,8 +16094,8 @@ msgstr "Seperti Mutahirkan-ke-revisi mengubah jendela waktu dari # Indonesian#: source/TortoiseGit_en.xml:11620(para) #. (para) #: ../source/TortoiseGit_en.xml:16137 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Perintah Subversion ini menarik perubahan terbaru dari repositori ke dalam copy pekerjaan Anda, menggabung setiap perubahan oleh orang lain dengan perubahan lokal dalam copy pekerjaan." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Perintah Git ini menarik perubahan terbaru dari repositori ke dalam copy pekerjaan Anda, menggabung setiap perubahan oleh orang lain dengan perubahan lokal dalam copy pekerjaan." # Indonesian#: source/TortoiseGit_en.xml:11457(glossterm) #. (glossterm) @@ -16124,25 +16124,25 @@ msgid "translator-translation" msgstr "Terjemahan oleh" #~ msgid "" -#~ "Subversion uses the / as the path delimiter in all " +#~ "Git uses the / as the path delimiter in all " #~ "internal pathnames, and all pattern matching is done against this style " #~ "of path names. If you want to use a path delimiter in your ignore " #~ "pattern, be sure to use /, and not the Windows " #~ "backslash." #~ msgstr "" -#~ "Subversion menggunakan / sebagai pemisah path dalam " +#~ "Git menggunakan / sebagai pemisah path dalam " #~ "semua nama path internal, dan semua pencocokan pola dilakukan ke gaya " #~ "nama-nama path ini. Jika Anda ingin menggunakan sebuah pemisah path dalam " #~ "pola abaikan Anda, pastikan Anda menggunakan /, dan " #~ "bukannya backslash Windows." #~ msgid "" -#~ "Subversion uses this pattern matching against every path presented to it " +#~ "Git uses this pattern matching against every path presented to it " #~ "for action. These paths are generally relative to the directory being " #~ "acted upon for import, add, commit, etc. The matching pattern therefore " #~ "has to take account of the fact that there may or may not be path " #~ "components before the filename." #~ msgstr "" -#~ "Subversion menggunakan pencocokan pola ini atas semua path yang " +#~ "Git menggunakan pencocokan pola ini atas semua path yang " #~ "disodorkan kepadanya untuk tindakan. Path-path ini secara umum relatif ke " #~ "direktori tempat dilakukannya impor, tambah, komit, dan lain-lain. Karena " #~ "itu, pencocokan pola harus memperhitungkan fakta bahwa komponen-komponen " @@ -16155,14 +16155,14 @@ msgstr "Terjemahan oleh" #~ "Fred.c but not subdir/Fred.c. This " #~ "is significant if you add a folder which contains some files that you " #~ "want to be ignored, because those filenames will be preceded with the " -#~ "folder name when Subversion compares them with the ignore pattern." +#~ "folder name when Git compares them with the ignore pattern." #~ msgstr "" #~ "Jika nama direktori ada dalam path, algoritma pencocokan tidak akan " #~ "menghilangkan mereka sehingga pola Fred.* akan cocok " #~ "dengan Fred.c tapi tidak subdir/Fred.c. Ini signifikan jika Anda menambahkan sebuah folder yang berisi " #~ "beberapa file yang ingin Anda abaikan, karena nama-nama file tersebut " -#~ "akan diawali dengan nama folder saat Subversion membandingkan mereka " +#~ "akan diawali dengan nama folder saat Git membandingkan mereka " #~ "dengan pola abaikan." #~ msgid "" #~ "The / character is not treated in any special way for " diff --git a/doc/po/TortoiseSVN_ja.po b/doc/po/TortoiseSVN_ja.po index 55465c1..54fcb09 100644 --- a/doc/po/TortoiseSVN_ja.po +++ b/doc/po/TortoiseSVN_ja.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2009-01-12 08:46 +0000\n" "PO-Revision-Date: 2009-01-22 22:12+0900\n" "Last-Translator: KURASAWA Nozomu \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,8 +41,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Subversion クライアント for Windows" +msgid "A Git client for Windows" +msgstr "Git クライアント for Windows" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -122,8 +122,8 @@ msgstr "読者" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "本書は、データ管理するのに Subversion を使用したいが、コマンドラインクライアントを使用するのに抵抗がある、コンピュータに詳しい人向けに書かれています。TortoiseGit は Windows のシェル拡張であるため、ユーザは Windows のエクスプローラになじみがあり、使い方を知っていると仮定しています。" +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "本書は、データ管理するのに Git を使用したいが、コマンドラインクライアントを使用するのに抵抗がある、コンピュータに詳しい人向けに書かれています。TortoiseGit は Windows のシェル拡張であるため、ユーザは Windows のエクスプローラになじみがあり、使い方を知っていると仮定しています。" #. (title) #: ../source/TortoiseGit_en.xml:84 @@ -142,18 +142,18 @@ msgstr " では TortoiseGit とは何か、 #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." -msgstr " では、TortoiseGit の基盤となる Subversion バージョン管理システムの簡単に解説しています。これは Subversion プロジェクトよりドキュメントを借りてきており、バージョン管理の異なる方法や Subversion がどのように動作するのかを説明しています。" +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." +msgstr " では、TortoiseGit の基盤となる Git バージョン管理システムの簡単に解説しています。これは Git プロジェクトよりドキュメントを借りてきており、バージョン管理の異なる方法や Git がどのように動作するのかを説明しています。" #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." -msgstr "ほとんどの Subversion ユーザは、サーバを自分たちでセットアップする必要はありません。次章では、そのようなサーバのセットアップ方法を取り扱います。管理者にとって有用な情報となるでしょう。" +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgstr "ほとんどの Git ユーザは、サーバを自分たちでセットアップする必要はありません。次章では、そのようなサーバのセットアップ方法を取り扱います。管理者にとって有用な情報となるでしょう。" #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr " の章では、単独 PC での Subversion や TortoiseGit のテストに便利な、ローカルリポジトリのセットアップ法を説明しています。また、サーバにあるリポジトリにも関係する、リポジトリ管理についても少し説明しています。" +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr " の章では、単独 PC での Git や TortoiseGit のテストに便利な、ローカルリポジトリのセットアップ法を説明しています。また、サーバにあるリポジトリにも関係する、リポジトリ管理についても少し説明しています。" #. (para) #: ../source/TortoiseGit_en.xml:113 @@ -177,8 +177,8 @@ msgstr " 節では TortoiseGit GUI ダイア #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." -msgstr " では TortoiseGit コマンドと Subversion コマンドラインクライアント svn.exe の同等機能との関連を示しています。" +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." +msgstr " では TortoiseGit コマンドと Git コマンドラインクライアント svn.exe の同等機能との関連を示しています。" #. (title) #: ../source/TortoiseGit_en.xml:144 @@ -202,8 +202,8 @@ msgstr "コミュニティ" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "TortoiseGit と Subversion のどちらも、それぞれのプロジェクトで作業する人々からなるコミュニティで開発を行っています。世界中のそれぞれの国から参加し、一緒にすばらしいプログラムを開発しています。" +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "TortoiseGit と Git のどちらも、それぞれのプロジェクトで作業する人々からなるコミュニティで開発を行っています。世界中のそれぞれの国から参加し、一緒にすばらしいプログラムを開発しています。" #. (title) #: ../source/TortoiseGit_en.xml:180 @@ -252,13 +252,13 @@ msgstr "文書化の手伝いや、バグつぶしに" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "The Subversion Book" +msgid "The Git Book" +msgstr "The Git Book" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "Subversion のすばらしい導入に (2 章はここからのコピー)" +msgid "for the great introduction to Git and its chapter 2 which we copied here" +msgstr "Git のすばらしい導入に (2 章はここからのコピー)" #. (term) #: ../source/TortoiseGit_en.xml:225 @@ -371,13 +371,13 @@ msgstr "TortoiseGit とは?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." -msgstr "TortoiseGit は、Subversion バージョン管理システム用のフリーでオープンソースなクライアントで、ファイルやディレクトリを時系列で管理します。ファイルはリポジトリという中心的な場所に格納されます。リポジトリは通常のファイルサーバとよく似ていますが、ファイルやディレクトリに加えた変更をすべて記録しています。これにより、ファイルを古いバージョンに戻したり、いつ、誰が、どのようにデータに変更を加えたかを履歴から確認できます。そのため、Subversion や一般的なバージョン管理システムを一種の タイムマシン と考える人たちもたくさんいます。" +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." +msgstr "TortoiseGit は、Git バージョン管理システム用のフリーでオープンソースなクライアントで、ファイルやディレクトリを時系列で管理します。ファイルはリポジトリという中心的な場所に格納されます。リポジトリは通常のファイルサーバとよく似ていますが、ファイルやディレクトリに加えた変更をすべて記録しています。これにより、ファイルを古いバージョンに戻したり、いつ、誰が、どのようにデータに変更を加えたかを履歴から確認できます。そのため、Git や一般的なバージョン管理システムを一種の タイムマシン と考える人たちもたくさんいます。" #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." -msgstr "いくつかのバージョン管理システムは、ソフトウェア構成管理 (SCM) システムでもあります。こういったシステムはソースコードのツリーを管理するために特別にあつらえられており、ソフトウェア開発に特化したたくさんの機能を持っています。- プログラム言語をネイティブに理解したり、ソフトウェアを構築するのに必要なツールが付属していたりといった具合です。しかし、Subversion はそういったシステムではありません。いずれの (ソースコードを含む) ファイルの集合を管理する汎用システムです。" +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgstr "いくつかのバージョン管理システムは、ソフトウェア構成管理 (SCM) システムでもあります。こういったシステムはソースコードのツリーを管理するために特別にあつらえられており、ソフトウェア開発に特化したたくさんの機能を持っています。- プログラム言語をネイティブに理解したり、ソフトウェアを構築するのに必要なツールが付属していたりといった具合です。しかし、Git はそういったシステムではありません。いずれの (ソースコードを含む) ファイルの集合を管理する汎用システムです。" #. (title) #: ../source/TortoiseGit_en.xml:368 @@ -386,18 +386,18 @@ msgstr "TortoiseGit の歴史" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "2002年、 Tim Kemp は Subversion というすばらしいバージョン管理システムと出会いましたが、使いやすい GUI クライアントが不足していました。Windows シェル統合した Subversion クライアントというアイディアは TortoiseCVS という CVS 用の似たようなクライアントから着想しました。" +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "2002年、 Tim Kemp は Git というすばらしいバージョン管理システムと出会いましたが、使いやすい GUI クライアントが不足していました。Windows シェル統合した Git クライアントというアイディアは TortoiseCVS という CVS 用の似たようなクライアントから着想しました。" #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Tim は TortoiseCVS のソースコードを解析し、TortoiseGit の基礎に利用しました。その後プロジェクトを開始し、TortoiseGit.org ドメインを登録し、ソースコードをオンラインに配置しました。この間、Stefan Küng はフリーの良いバージョン管理システムを探していて、Subversion と TortoiseGit のソースコードに出会いました。TortoiseGit はまだ使い物になりませんでしたが、このプロジェクトに参加しプログラミングを始めました。Stefan はすぐに、オリジナルのコードが全く残らないほど既存のコードをほとんど書き換え、コマンドや機能を追加していきました。" +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Tim は TortoiseCVS のソースコードを解析し、TortoiseGit の基礎に利用しました。その後プロジェクトを開始し、TortoiseGit.org ドメインを登録し、ソースコードをオンラインに配置しました。この間、Stefan Küng はフリーの良いバージョン管理システムを探していて、Git と TortoiseGit のソースコードに出会いました。TortoiseGit はまだ使い物になりませんでしたが、このプロジェクトに参加しプログラミングを始めました。Stefan はすぐに、オリジナルのコードが全く残らないほど既存のコードをほとんど書き換え、コマンドや機能を追加していきました。" #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." -msgstr "Subversion が安定するようになるにつれて、Subversion クライアントとして TortoiseGit を使用するユーザが増えてきました。ユーザベースは急速に拡大しました (そして日々拡大しています)。Lübbe Onken は TortoiseGit のロゴとすばらしいアイコンで協力すると申し出てくれました。また彼はウェブサイトと翻訳の管理をしてくれています。" +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgstr "Git が安定するようになるにつれて、Git クライアントとして TortoiseGit を使用するユーザが増えてきました。ユーザベースは急速に拡大しました (そして日々拡大しています)。Lübbe Onken は TortoiseGit のロゴとすばらしいアイコンで協力すると申し出てくれました。また彼はウェブサイトと翻訳の管理をしてくれています。" #. (title) #: ../source/TortoiseGit_en.xml:399 @@ -406,8 +406,8 @@ msgstr "TortoiseGit の特徴" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." -msgstr "TortoiseGit はどのようにすばらしい Subversion クライアントなのでしょうか? 以下は簡単な特徴の一覧です。" +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." +msgstr "TortoiseGit はどのようにすばらしい Git クライアントなのでしょうか? 以下は簡単な特徴の一覧です。" #. (term) #: ../source/TortoiseGit_en.xml:406 @@ -446,18 +446,18 @@ msgstr "ファイルやフォルダごとにバージョン管理の状態をあ #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Subversion コマンドへの容易なアクセス" +msgid "Easy access to Git commands" +msgstr "Git コマンドへの容易なアクセス" #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." -msgstr "すべての Subversion コマンドにエクスプローラのコンテキストメニューからアクセスできます。TortoiseGit は独自のサブメニューも追加します。" +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgstr "すべての Git コマンドにエクスプローラのコンテキストメニューからアクセスできます。TortoiseGit は独自のサブメニューも追加します。" #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "TortoiseGit は Subversion クライアントですから、Subversion 自体が持つ特徴も以下に述べます。" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" +msgstr "TortoiseGit は Git クライアントですから、Git 自体が持つ特徴も以下に述べます。" #. (term) #: ../source/TortoiseGit_en.xml:460 @@ -466,8 +466,8 @@ msgstr "ディレクトリのバージョン管理" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS は個々のファイルの履歴しか追跡できませんが、Subversion は、時系列でディレクトリツリー全体に行われた変更を追跡する 仮想的な バージョン管理ファイルシステムを実装しています。ファイルとディレクトリがバージョン管理されます。その結果、クライアント側の move や copy コマンドでファイルやディレクトリの操作を実際に行うことができます。" +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS は個々のファイルの履歴しか追跡できませんが、Git は、時系列でディレクトリツリー全体に行われた変更を追跡する 仮想的な バージョン管理ファイルシステムを実装しています。ファイルとディレクトリがバージョン管理されます。その結果、クライアント側の move や copy コマンドでファイルやディレクトリの操作を実際に行うことができます。" #. (term) #: ../source/TortoiseGit_en.xml:475 @@ -496,8 +496,8 @@ msgstr "ネットワークレイヤの選択" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "Subversion にはリポジトリアクセス用に抽象的な概念を持っていて、新しいネットワークメカニズムを簡単に実装できるようになっています。Subversion の 先進的 ネットワークサーバは Apache ウェブサーバのモジュールになっており、WebDAV/DeltaV と呼ばれる HTTP の一種を話します。これは、Subversion に安定性や相互運用性の面で大きな利点を与え、例えば、認証、認可、データ圧縮、リポジトリ閲覧といった、様々な重要な特徴をすぐに使用できます。また、もっと小さなスタンドアロン Subversion サーバも使用できます。このサーバは ssh で簡単にトンネル通信ができる独自プロトコルを話します。" +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "Git にはリポジトリアクセス用に抽象的な概念を持っていて、新しいネットワークメカニズムを簡単に実装できるようになっています。Git の 先進的 ネットワークサーバは Apache ウェブサーバのモジュールになっており、WebDAV/DeltaV と呼ばれる HTTP の一種を話します。これは、Git に安定性や相互運用性の面で大きな利点を与え、例えば、認証、認可、データ圧縮、リポジトリ閲覧といった、様々な重要な特徴をすぐに使用できます。また、もっと小さなスタンドアロン Git サーバも使用できます。このサーバは ssh で簡単にトンネル通信ができる独自プロトコルを話します。" #. (term) #: ../source/TortoiseGit_en.xml:516 @@ -506,8 +506,8 @@ msgstr "一貫したデータの取り扱い" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." -msgstr "Subversion はファイルの差分を、バイナリ差分アルゴリズムを用いて表現します。これはテキストファイル (人が読める形式) でも バイナリファイル (人が読めない形式) でも同様です。どちらのタイプのファイルでも、リポジトリに圧縮して格納されます。また、差分はネットワークを使って双方向に送信されます。" +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgstr "Git はファイルの差分を、バイナリ差分アルゴリズムを用いて表現します。これはテキストファイル (人が読める形式) でも バイナリファイル (人が読めない形式) でも同様です。どちらのタイプのファイルでも、リポジトリに圧縮して格納されます。また、差分はネットワークを使って双方向に送信されます。" #. (term) #: ../source/TortoiseGit_en.xml:529 @@ -516,8 +516,8 @@ msgstr "効果的なブランチ・タグ付け" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." -msgstr "ブランチやタグをつけるコストは、プロジェクトの規模に比例する必要はありません。Subversion はブランチやタグを作成するのに、ハードリンクによく似た単純なプロジェクトのコピーで行います。そのため、この操作はとても小さく、一定の時間で完了し、リポジトリのとても小さな領域しか使用しません。" +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgstr "ブランチやタグをつけるコストは、プロジェクトの規模に比例する必要はありません。Git はブランチやタグを作成するのに、ハードリンクによく似た単純なプロジェクトのコピーで行います。そのため、この操作はとても小さく、一定の時間で完了し、リポジトリのとても小さな領域しか使用しません。" #. (term) #: ../source/TortoiseGit_en.xml:542 @@ -526,8 +526,8 @@ msgstr "いじりやすさ" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Subversion は歴史的なしがらみを持っていません。よく練られた API でできた C の共有ライブラリの集まりで実装されています。これにより、Subversion は非常に保守しやすく、他の言語やアプリケーションから利用しやすくなっています。" +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." +msgstr "Git は歴史的なしがらみを持っていません。よく練られた API でできた C の共有ライブラリの集まりで実装されています。これにより、Git は非常に保守しやすく、他の言語やアプリケーションから利用しやすくなっています。" #. (title) #: ../source/TortoiseGit_en.xml:558 @@ -671,23 +671,23 @@ msgstr "基本コンセプト" #. (primary) #: ../source/TortoiseGit_en.xml:725 -msgid "Subversion book" -msgstr "Subversion book" +msgid "Git book" +msgstr "Git book" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." -msgstr "この章は Subversion book にある同章をわずかに変更したものです。Subversion book のオンライン版は 以下で読むことができます。http://svnbook.red-bean.com/ (訳注 日本語では http://subversion.bluegate.org/doc/book.html で読めます)" +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." +msgstr "この章は Git book にある同章をわずかに変更したものです。Git book のオンライン版は 以下で読むことができます。http://svnbook.red-bean.com/ (訳注 日本語では http://Git.bluegate.org/doc/book.html で読めます)" #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." -msgstr "この章では簡単におおざっぱな Subversion の概要を説明します。バージョン管理システムが初めてなら、この章が明らかにしてくれるでしょう。一般的なバージョン管理の概念から始めて、Subversion の根底にあるアイディアを説明し、Subversion の使い方の簡単な例をお見せします。" +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." +msgstr "この章では簡単におおざっぱな Git の概要を説明します。バージョン管理システムが初めてなら、この章が明らかにしてくれるでしょう。一般的なバージョン管理の概念から始めて、Git の根底にあるアイディアを説明し、Git の使い方の簡単な例をお見せします。" #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." -msgstr "この章の例では複数のプログラムソースコードの共有を扱いますが、Subversion はどんなファイルでも扱えるということに留意してください。コンピュータプログラマを助けるためだけのものではありません。" +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." +msgstr "この章の例では複数のプログラムソースコードの共有を扱いますが、Git はどんなファイルでも扱えるということに留意してください。コンピュータプログラマを助けるためだけのものではありません。" #. (title) #. (title) @@ -707,8 +707,8 @@ msgstr "リポジトリ" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." -msgstr "Subversion は情報共有の一元管理システムです。この核となるのがデータを格納する リポジトリ です。リポジトリは情報を ファイルシステムツリー (典型的なのはファイルやディレクトリの階層) の形で格納します。複数の クライアント がリポジトリに接続し、そのファイルを読み書きします。データを書き込むと他の人が情報を利用できるようになりますし、データを読み込むと他の人の情報をクライアントが受信します。" +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgstr "Git は情報共有の一元管理システムです。この核となるのがデータを格納する リポジトリ です。リポジトリは情報を ファイルシステムツリー (典型的なのはファイルやディレクトリの階層) の形で格納します。複数の クライアント がリポジトリに接続し、そのファイルを読み書きします。データを書き込むと他の人が情報を利用できるようになりますし、データを読み込むと他の人の情報をクライアントが受信します。" #. (title) #: ../source/TortoiseGit_en.xml:767 @@ -717,8 +717,8 @@ msgstr "典型的なクライアント・サーバシステム" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." -msgstr "このどこが興味深いというのでしょうか? そこまでは普通のファイルサーバと同じように聞こえます。確かにリポジトリはファイルサーバの一種ですが、いつも目にするものとは違います。Subversion のリポジトリが特別なのは、そこに書き込まれたすべての変更を記憶しているということです。これはすべてのファイルに対するすべての変更と、さらにディレクトリツリー自体に対して行われたファイルやディレクトリの追加・削除・再配置といった変更も含まれています。" +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgstr "このどこが興味深いというのでしょうか? そこまでは普通のファイルサーバと同じように聞こえます。確かにリポジトリはファイルサーバの一種ですが、いつも目にするものとは違います。Git のリポジトリが特別なのは、そこに書き込まれたすべての変更を記憶しているということです。これはすべてのファイルに対するすべての変更と、さらにディレクトリツリー自体に対して行われたファイルやディレクトリの追加・削除・再配置といった変更も含まれています。" #. (para) #: ../source/TortoiseGit_en.xml:780 @@ -791,8 +791,8 @@ msgstr "コピー・変更・マージ法" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." -msgstr "Subversion や CVS、その他のバージョンコントロールシステムは、コピー・変更・マージ モデルをロックの代わりに使用します。このモデルではユーザのクライアントごとにリポジトリを読み込み、ファイルやプロジェクトの個人的な作業コピーを作成します。そこからユーザは平行して作業し、個人のコピーを変更します。最後に個人のコピーを新しい最終版にマージします。バージョン管理システムはマージの補助を行いますが、正しくできたかどうかの最終的な責任は人間が負うことになります。" +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgstr "Git や CVS、その他のバージョンコントロールシステムは、コピー・変更・マージ モデルをロックの代わりに使用します。このモデルではユーザのクライアントごとにリポジトリを読み込み、ファイルやプロジェクトの個人的な作業コピーを作成します。そこからユーザは平行して作業し、個人のコピーを変更します。最後に個人のコピーを新しい最終版にマージします。バージョン管理システムはマージの補助を行いますが、正しくできたかどうかの最終的な責任は人間が負うことになります。" #. (para) #: ../source/TortoiseGit_en.xml:907 @@ -833,18 +833,18 @@ msgstr "ロック・変更・アンロックモデルの方がよいといわれ #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" -msgstr "Subversion は何を行うか?" +msgid "What does Git Do?" +msgstr "Git は何を行うか?" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." -msgstr "デフォルトで Subversion はコピー・変更・マージ法を使用しますし、ほとんどの場合この方法が常に必要だと思います。しかし、バージョン 1.2 で、Subversion はファイルのロックもサポートしました。したがって、マージできないファイルがあったり、管理するのに単にロックポリシーを強制する場合に、Subversion はそういったお好みの機能を提供することができます。" +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." +msgstr "デフォルトで Git はコピー・変更・マージ法を使用しますし、ほとんどの場合この方法が常に必要だと思います。しかし、バージョン 1.2 で、Git はファイルのロックもサポートしました。したがって、マージできないファイルがあったり、管理するのに単にロックポリシーを強制する場合に、Git はそういったお好みの機能を提供することができます。" #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" -msgstr "Subversion の動作" +msgid "Git in Action" +msgstr "Git の動作" #. (title) #: ../source/TortoiseGit_en.xml:991 @@ -858,28 +858,28 @@ msgstr "作業コピー" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." -msgstr "作業コピーについてはすでに説明したとおりですので、今度は Subversion クライアントで作業コピーの作成・使用について見ていきましょう。" +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." +msgstr "作業コピーについてはすでに説明したとおりですので、今度は Git クライアントで作業コピーの作成・使用について見ていきましょう。" #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." -msgstr "Subversion の作業コピーは、手元のシステム上にある通常のディレクトリツリーで、ここにファイルが集められています。お望みのファイルをどれでも編集することができますし、それがソースコードのファイルなら、いつも通りそのファイルからプログラムをコンパイルできます。作業コピーはあなたの個人的な作業エリアです。Subversion が他の人の変更をここに組み込むことはありませんし、同様に、明示されるまであなたの変更が他の人から使用できるようになることもありません。" +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgstr "Git の作業コピーは、手元のシステム上にある通常のディレクトリツリーで、ここにファイルが集められています。お望みのファイルをどれでも編集することができますし、それがソースコードのファイルなら、いつも通りそのファイルからプログラムをコンパイルできます。作業コピーはあなたの個人的な作業エリアです。Git が他の人の変更をここに組み込むことはありませんし、同様に、明示されるまであなたの変更が他の人から使用できるようになることもありません。" #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." -msgstr "作業コピーのファイルに変更を加え、それがうまく動作することを確認したあとで、Subversion はその変更を同じプロジェクトであなたと一緒に 作業しているほかの人に 公開 するためのコマンドを (リポジトリに書き込むことで) 用意します。もし他の人が自分自身の変更を公開したとき にはSubversionはその変更を自分の作業コピーにマージするコマンドを (リポジトリの内容を読み出して) 用意します。" +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgstr "作業コピーのファイルに変更を加え、それがうまく動作することを確認したあとで、Git はその変更を同じプロジェクトであなたと一緒に 作業しているほかの人に 公開 するためのコマンドを (リポジトリに書き込むことで) 用意します。もし他の人が自分自身の変更を公開したとき にはGitはその変更を自分の作業コピーにマージするコマンドを (リポジトリの内容を読み出して) 用意します。" #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." -msgstr "作業コピーには、Subversion によって作成・保守される特別なファイルがあり、その助けを受けてコマンドを実行します。特に作業コピーのディレクトリごとに .svn という名前のサブディレクトリがあり、これは作業コピーの 管理ディレクトリ として知られています。管理ディレクトリのそれぞれのファイルは、まだ公開していない変更があるか、また他の人の作業によって最新でなくなっているかを Subversion が認識する助けになります。" +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgstr "作業コピーには、Git によって作成・保守される特別なファイルがあり、その助けを受けてコマンドを実行します。特に作業コピーのディレクトリごとに .svn という名前のサブディレクトリがあり、これは作業コピーの 管理ディレクトリ として知られています。管理ディレクトリのそれぞれのファイルは、まだ公開していない変更があるか、また他の人の作業によって最新でなくなっているかを Git が認識する助けになります。" #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." -msgstr "典型的な Subversion リポジトリは、いくつものプロジェクトのファイル (やソースコード) を保持し、リポジトリのファイルシステムツリー以下に、プロジェクトごとのサブディレクトリがあります。この配置では、ユーザの作業コピーは大抵リポジトリの特殊なサブツリーに相当します。" +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgstr "典型的な Git リポジトリは、いくつものプロジェクトのファイル (やソースコード) を保持し、リポジトリのファイルシステムツリー以下に、プロジェクトごとのサブディレクトリがあります。この配置では、ユーザの作業コピーは大抵リポジトリの特殊なサブツリーに相当します。" #. (para) #: ../source/TortoiseGit_en.xml:1038 @@ -903,13 +903,13 @@ msgstr "作業コピーを取得するのに、チェックアウト< #. (para) #: ../source/TortoiseGit_en.xml:1058 -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." -msgstr "button.c への変更を行うことを思い浮かべてください。.svn ディレクトリはファイルの変更日付と元の内容を記憶していますから、Subversion はファイルが変更されていることを教えてくれます。しかし、あなたの行った変更を (あなたが明示するまで) 公開にしません。あなたが変更を公開することは、リポジトリへのコミット (やチェックイン) と呼ばれています。" +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgstr "button.c への変更を行うことを思い浮かべてください。.svn ディレクトリはファイルの変更日付と元の内容を記憶していますから、Git はファイルが変更されていることを教えてくれます。しかし、あなたの行った変更を (あなたが明示するまで) 公開にしません。あなたが変更を公開することは、リポジトリへのコミット (やチェックイン) と呼ばれています。" #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." -msgstr "あなたの変更を他の人に公開するには、Subversion の commit コマンドを使用してください。" +msgid "To publish your changes to others, you can use Git's commit command." +msgstr "あなたの変更を他の人に公開するには、Git の commit コマンドを使用してください。" #. (para) #: ../source/TortoiseGit_en.xml:1072 @@ -918,18 +918,18 @@ msgstr "さて、button.c への変更を、リポジトリ #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." -msgstr "あなたに Sally という相棒がいて、/calc の作業コピーをあなたと同時にチェックアウトしたとします。あなたが button.c の変更をコミットしても、Sally の作業コピーは変更されないままです。Subversion はユーザのリクエストによってのみ作業コピーを更新するからです。" +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." +msgstr "あなたに Sally という相棒がいて、/calc の作業コピーをあなたと同時にチェックアウトしたとします。あなたが button.c の変更をコミットしても、Sally の作業コピーは変更されないままです。Git はユーザのリクエストによってのみ作業コピーを更新するからです。" #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." -msgstr "Sally のプロジェクトを最新にするには、Subversion に作業コピーを更新するよう指示します。これは Subversion の update コマンドを使用します。これによりあなたの変更が Sally の作業コピーに組み込まれ、またチェックアウト後にコミットされた他の人の変更も同様に組み込まれます。" +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgstr "Sally のプロジェクトを最新にするには、Git に作業コピーを更新するよう指示します。これは Git の update コマンドを使用します。これによりあなたの変更が Sally の作業コピーに組み込まれ、またチェックアウト後にコミットされた他の人の変更も同様に組み込まれます。" #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." -msgstr "Sally がどのファイルを更新するか指定する必要がないことに注意してください。Subversion は .svn ディレクトリの情報とリポジトリ内の詳細情報を用い、どのファイルを更新するか決めるのです。" +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgstr "Sally がどのファイルを更新するか指定する必要がないことに注意してください。Git は .svn ディレクトリの情報とリポジトリ内の詳細情報を用い、どのファイルを更新するか決めるのです。" #. (title) #: ../source/TortoiseGit_en.xml:1103 @@ -938,8 +938,8 @@ msgstr "リポジトリ URL" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" -msgstr "Subversion リポジトリはたくさんの異なる方法 (ローカルディスクや様々なネットワークプロトコル) でアクセスできます。しかし、リポジトリの位置は常に URL で表されます。URL スキーマはアクセス方法を表します。" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgstr "Git リポジトリはたくさんの異なる方法 (ローカルディスクや様々なネットワークプロトコル) でアクセスできます。しかし、リポジトリの位置は常に URL で表されます。URL スキーマはアクセス方法を表します。" #. (title) #: ../source/TortoiseGit_en.xml:1112 @@ -975,8 +975,8 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "Subversion を組み込んだ Apache サーバに WebDAV プロトコルでアクセスします。" +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "Git を組み込んだ Apache サーバに WebDAV プロトコルでアクセスします。" #. (literal) #: ../source/TortoiseGit_en.xml:1141 @@ -1021,8 +1021,8 @@ msgstr " サーバと独自プロトコルで行う、認証・ #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." -msgstr "ほとんどの場合、Subversion の URL には標準文法を使用し、URL の中にサーバ名やポート番号を含められます。file:// アクセスメソッドは通常ローカルアクセスに使用しますが、ネットワーク上のホストに対する UNC パスにも使用できます。そのため URL は file://hostname/path/to/repos といった形式になります。ローカルマシンでは URL の hostname の部分を空にするか localhost としてください。このためローカルパスは、file:///path/to/repos のようにスラッシュが 3 つ並ぶことになります。" +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgstr "ほとんどの場合、Git の URL には標準文法を使用し、URL の中にサーバ名やポート番号を含められます。file:// アクセスメソッドは通常ローカルアクセスに使用しますが、ネットワーク上のホストに対する UNC パスにも使用できます。そのため URL は file://hostname/path/to/repos といった形式になります。ローカルマシンでは URL の hostname の部分を空にするか localhost としてください。このためローカルパスは、file:///path/to/repos のようにスラッシュが 3 つ並ぶことになります。" #. (para) #: ../source/TortoiseGit_en.xml:1181 @@ -1081,8 +1081,8 @@ msgstr "svn commit 操作はファイルやディレクトリ #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." -msgstr "リポジトリでは、コミットを不可分トランザクションとして扱い、全てをそこに置くか何も置かないかのどちらかになります。Subversion はプログラムのクラッシュや、システムクラッシュ、ネットワーク障害、他のユーザの操作に直面してもこの最小単位を保持しようとします。" +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgstr "リポジトリでは、コミットを不可分トランザクションとして扱い、全てをそこに置くか何も置かないかのどちらかになります。Git はプログラムのクラッシュや、システムクラッシュ、ネットワーク障害、他のユーザの操作に直面してもこの最小単位を保持しようとします。" #. (para) #: ../source/TortoiseGit_en.xml:1238 @@ -1101,8 +1101,8 @@ msgstr "グローバルリビジョン番号" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" -msgstr "多くのバージョン管理システムと違い、Subversion のリビジョン番号はツリー全体に対してつけられるもので、個々のファイルにつけるものではありません。それぞれのリビジョン番号はツリー全体を指定し、ある変更をコミットした後のリポジトリの特定の状態を示すものです。これについて考える別の方法は、リビジョン N は N 番目のコミット後のリポジトリファイルシステムの状態をあらわしていると考えることです。Subversion ユーザが、「foo.c のリビジョン 5」と言うとき、それが実際に意味するものは、「リビジョン5に現れる foo.c」です。一般的に、あるファイルのリビジョン N と M は異なっている必要はありません。" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgstr "多くのバージョン管理システムと違い、Git のリビジョン番号はツリー全体に対してつけられるもので、個々のファイルにつけるものではありません。それぞれのリビジョン番号はツリー全体を指定し、ある変更をコミットした後のリポジトリの特定の状態を示すものです。これについて考える別の方法は、リビジョン N は N 番目のコミット後のリポジトリファイルシステムの状態をあらわしていると考えることです。Git ユーザが、「foo.c のリビジョン 5」と言うとき、それが実際に意味するものは、「リビジョン5に現れる foo.c」です。一般的に、あるファイルのリビジョン N と M は異なっている必要はありません。" #. (para) #: ../source/TortoiseGit_en.xml:1276 @@ -1163,8 +1163,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." -msgstr "Sally の integer.c への変更は、あなたの作業コピーに現れますが、button.c へ行ったあなたの変更はそのままです。この例では、Makefile のテキストはリビジョン 4, 5, 6 で全く同じものですが、Subversion は作業コピー中の Makefile のリビジョンを 6 にして最新であることを表現します。そのため作業コピーのトップでまっさらな更新を行うと、一般的に、作業コピーはリポジトリの特定のバージョンに完全に一致します。" +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgstr "Sally の integer.c への変更は、あなたの作業コピーに現れますが、button.c へ行ったあなたの変更はそのままです。この例では、Makefile のテキストはリビジョン 4, 5, 6 で全く同じものですが、Git は作業コピー中の Makefile のリビジョンを 6 にして最新であることを表現します。そのため作業コピーのトップでまっさらな更新を行うと、一般的に、作業コピーはリポジトリの特定のバージョンに完全に一致します。" #. (title) #: ../source/TortoiseGit_en.xml:1325 @@ -1173,8 +1173,8 @@ msgstr "作業コピーのリポジトリ追跡方法" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" -msgstr "作業ディレクトリ内のファイルに対して、Subversion は 2 つの本質的な情報を .svn/ 管理領域に記録します。" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" +msgstr "作業ディレクトリ内のファイルに対して、Git は 2 つの本質的な情報を .svn/ 管理領域に記録します。" #. (para) #: ../source/TortoiseGit_en.xml:1332 @@ -1188,8 +1188,8 @@ msgstr "手元のコピーをリポジトリから更新したときに記録し #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" -msgstr "この情報とリポジトリとのやりとりによって、Subversion は、作業ファイルが以下の4つの状態のどれかを確認できます。" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" +msgstr "この情報とリポジトリとのやりとりによって、Git は、作業ファイルが以下の4つの状態のどれかを確認できます。" #. (term) #: ../source/TortoiseGit_en.xml:1352 @@ -1228,8 +1228,8 @@ msgstr "手元で更新、かつ最新ではない" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." -msgstr "ファイルは作業コピーでも、リポジトリでも変更されています。 ファイルに対する commit はout-of-date エラーになります。まず、そのファイルを更新しなくてはなりません。ファイルに対する update は公開されている変更点 を作業コピーの変更にマージしようとします。これが自動的にできないような状況の場合、ユーザが競合の解消を行うため、Subversion はそのままにしておきます。" +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgstr "ファイルは作業コピーでも、リポジトリでも変更されています。 ファイルに対する commit はout-of-date エラーになります。まず、そのファイルを更新しなくてはなりません。ファイルに対する update は公開されている変更点 を作業コピーの変更にマージしようとします。これが自動的にできないような状況の場合、ユーザが競合の解消を行うため、Git はそのままにしておきます。" #. (title) #: ../source/TortoiseGit_en.xml:1412 @@ -1238,8 +1238,8 @@ msgstr "まとめ" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "この章では Subversion の基本的なコンセプトの数々をカバーしました。" +msgid "We've covered a number of fundamental Git concepts in this chapter:" +msgstr "この章では Git の基本的なコンセプトの数々をカバーしました。" #. (para) #: ../source/TortoiseGit_en.xml:1419 @@ -1248,13 +1248,13 @@ msgstr "中心となるリポジトリ、クライアントの作業コピー、 #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." -msgstr "2 人の共同作業者が Subversion を用いて、どのようにお互いの変更を公開・取得するかを簡単な例で見てきました。これには「コピー・変更・マージ」モデルを使用します。" +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgstr "2 人の共同作業者が Git を用いて、どのようにお互いの変更を公開・取得するかを簡単な例で見てきました。これには「コピー・変更・マージ」モデルを使用します。" #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." -msgstr "Subversion が作業コピーの情報を追跡・管理する方法について少し触れました。" +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." +msgstr "Git が作業コピーの情報を追跡・管理する方法について少し触れました。" #. (title) #: ../source/TortoiseGit_en.xml:1445 @@ -1263,13 +1263,13 @@ msgstr "サーバのセットアップ" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." -msgstr "TortoiseGit (や、その他の Subversion クライアント) を使用する場合、リポジトリを配置する場所が必要です。リポジトリをローカルに配置して、file:// プロトコルでアクセスしたり、サーバ上に配置して http:// や svn:// プロトコルでアクセスしたりすることもできます。2 つのサーバプロトコルともに暗号化することもできます。https:// や svn+ssh:// を使います。本章では、Windows マシン上にそういったサーバを構築する手順を、順を追って説明します。" +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgstr "TortoiseGit (や、その他の Git クライアント) を使用する場合、リポジトリを配置する場所が必要です。リポジトリをローカルに配置して、file:// プロトコルでアクセスしたり、サーバ上に配置して http:// や svn:// プロトコルでアクセスしたりすることもできます。2 つのサーバプロトコルともに暗号化することもできます。https:// や svn+ssh:// を使います。本章では、Windows マシン上にそういったサーバを構築する手順を、順を追って説明します。" #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." -msgstr "Subversion サーバのオプションのより詳細な情報や、あなたにピッタリなアーキテクチャの選択する方法は、Subversion book の Server Configuration にあります。" +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." +msgstr "Git サーバのオプションのより詳細な情報や、あなたにピッタリなアーキテクチャの選択する方法は、Git book の Server Configuration にあります。" #. (para) #: ../source/TortoiseGit_en.xml:1466 @@ -1293,8 +1293,8 @@ msgstr "Apache" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" -msgstr "Subversion 用にセットアップできるサーバのうち、もっとも柔軟なのは Apache ベースの物です。セットアップするには少し複雑ですが、他のサーバが提供できない特徴があります。" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgstr "Git 用にセットアップできるサーバのうち、もっとも柔軟なのは Apache ベースの物です。セットアップするには少し複雑ですが、他のサーバが提供できない特徴があります。" #. (primary) #. (term) @@ -1305,8 +1305,8 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." -msgstr "Apache ベースの Subversion サーバは、多数の他のプログラムがサポートする WebDAV プロトコルを使用します。例えば、リポジトリを Windows エクスプローラで言う Web フォルダ としてマウントでき、ファイルシステムのその他のフォルダのようにアクセスできます。" +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgstr "Apache ベースの Git サーバは、多数の他のプログラムがサポートする WebDAV プロトコルを使用します。例えば、リポジトリを Windows エクスプローラで言う Web フォルダ としてマウントでき、ファイルシステムのその他のフォルダのようにアクセスできます。" #. (term) #: ../source/TortoiseGit_en.xml:1509 @@ -1315,8 +1315,8 @@ msgstr "リポジトリの閲覧" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." -msgstr "ブラウザにリポジトリの URL を入力することで、Subversion クライアントをインストールしていなくても内容を閲覧できます。これにより、より大きなユーザの輪がそのデータにアクセスできるようになります。" +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." +msgstr "ブラウザにリポジトリの URL を入力することで、Git クライアントをインストールしていなくても内容を閲覧できます。これにより、より大きなユーザの輪がそのデータにアクセスできるようになります。" #. (term) #. (title) @@ -1397,18 +1397,18 @@ msgstr "Apache をインストールするためには、コンピュータが W #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Subversion のインストール" +msgid "Installing Git" +msgstr "Git のインストール" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Apache 用 Subversion Win32 バイナリの最新版をダウンロードしてください。必ず、使用する Apache のバージョンと組み合わさる、正しいバージョンを使用してください。そうしないと、再起動しようとした際に、不明瞭なエラーメッセージを得ることになります。Apache 2.2.x を使用する場合、http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100 へ進んでください。" +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Apache 用 Git Win32 バイナリの最新版をダウンロードしてください。必ず、使用する Apache のバージョンと組み合わさる、正しいバージョンを使用してください。そうしないと、再起動しようとした際に、不明瞭なエラーメッセージを得ることになります。Apache 2.2.x を使用する場合、http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100 へ進んでください。" #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." -msgstr "Subversion インストーラを実行し、説明に従ってください。Subversion インストーラがインストール済みの Apache を認識した場合、それでほとんど終了です。Apache サーバが見つからない場合、いくつか追加の手順があります。" +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgstr "Git インストーラを実行し、説明に従ってください。Git インストーラがインストール済みの Apache を認識した場合、それでほとんど終了です。Apache サーバが見つからない場合、いくつか追加の手順があります。" #. (primary) #. (primary) @@ -1419,13 +1419,13 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "Windows エクスプローラで、Subversion のインストールディレクトリ (通常 c:\\program files\\Subversion) に移動し、/httpd/mod_dav_svn.so と mod_authz_svn.so を確認してください。そのファイルを Apache モジュールディレクトリ (通常 c:\\program files\\apache group\\apache2\\modules ) にコピーしてください。" +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "Windows エクスプローラで、Git のインストールディレクトリ (通常 c:\\program files\\Git) に移動し、/httpd/mod_dav_svn.so と mod_authz_svn.so を確認してください。そのファイルを Apache モジュールディレクトリ (通常 c:\\program files\\apache group\\apache2\\modules ) にコピーしてください。" #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." -msgstr "Subversion インストールディレクトリにある /bin/libdb*.dll や /bin/intl3_svn.dll を、Apache bin ディレクトリにコピーしてください。" +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." +msgstr "Git インストールディレクトリにある /bin/libdb*.dll や /bin/intl3_svn.dll を、Apache bin ディレクトリにコピーしてください。" #. (para) #: ../source/TortoiseGit_en.xml:1677 @@ -1468,12 +1468,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "以下の行を設定ファイルの最後に追加してください。\n" "<Location /svn>\n" @@ -1482,12 +1482,12 @@ msgstr "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" これで Apache に、すべての Subversion リポジトリの物理的な位置が D:\\SVN 以下にあるように設定できます。リポジトリは外部に URL: http://MyServer/svn/ で提供することになります。アクセス制限は passwd ファイルに記述した users/password の組で行います。" +" これで Apache に、すべての Git リポジトリの物理的な位置が D:\\SVN 以下にあるように設定できます。リポジトリは外部に URL: http://MyServer/svn/ で提供することになります。アクセス制限は passwd ファイルに記述した users/password の組で行います。" #. (para) #: ../source/TortoiseGit_en.xml:1740 @@ -1511,13 +1511,13 @@ msgstr "再度 Apache サービスを再起動してください。" #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "ブラウザで http://MyServer/svn/MyNewRepository (MyNewRepository には、あらかじめ作成しておいた Subversion リポジトリの名前に置き換えてください) すべてうまくいったのなら、ユーザ名とパスワードを入力でき、リポジトリの内容を見ることができます。" +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "ブラウザで http://MyServer/svn/MyNewRepository (MyNewRepository には、あらかじめ作成しておいた Git リポジトリの名前に置き換えてください) すべてうまくいったのなら、ユーザ名とパスワードを入力でき、リポジトリの内容を見ることができます。" #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "以上で Apache と Subversion をセットアップしました。しかし Apache は、どのように TortoiseGit のような Subversion クライアントを扱うかをまだ知りません。Subversion リポジトリが使用する URL を Apache に教えるために、Apache 設定ファイル (通常、c:\\program files\\apache group\\apache2\\conf\\httpd.conf) をお好みのテキストエディタ (例: メモ帳) で以下のように編集してください。 " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "以上で Apache と Git をセットアップしました。しかし Apache は、どのように TortoiseGit のような Git クライアントを扱うかをまだ知りません。Git リポジトリが使用する URL を Apache に教えるために、Apache 設定ファイル (通常、c:\\program files\\apache group\\apache2\\conf\\httpd.conf) をお好みのテキストエディタ (例: メモ帳) で以下のように編集してください。 " #. (primary) #: ../source/TortoiseGit_en.xml:1777 @@ -1555,18 +1555,18 @@ msgstr "http://MyServer/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " -msgstr "Subversion リポジトリは URL から有効になることを意味します。" +msgid "means that the Git repositories are available from the URL " +msgstr "Git リポジトリは URL から有効になることを意味します。" #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "Apache にその URL にはどのモジュールがレスポンスを返せばいいか指示します。この場合は Subversion モジュール。" +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." +msgstr "Apache にその URL にはどのモジュールがレスポンスを返せばいいか指示します。この場合は Git モジュール。" #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." -msgstr "Subversion バージョン 1.3 以降では、 に列挙した有効なリポジトリに対してこのディレクティブが有効になります。" +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." +msgstr "Git バージョン 1.3 以降では、 に列挙した有効なリポジトリに対してこのディレクティブが有効になります。" #. (filename) #: ../source/TortoiseGit_en.xml:1822 @@ -1575,8 +1575,8 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " -msgstr "Subversion に以下のリポジトリを探すように指示します。" +msgid "tells Git to look for repositories below " +msgstr "Git に以下のリポジトリを探すように指示します。" #. (entry) #: ../source/TortoiseGit_en.xml:1827 @@ -1600,8 +1600,8 @@ msgstr "認証に使用するパスワードファイルを指定します。" #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "Subversion リポジトリ内のアクセスファイルの場所。" +msgid "Location of the Access file for paths inside a Git repository" +msgstr "Git リポジトリ内のアクセスファイルの場所。" #. (entry) #: ../source/TortoiseGit_en.xml:1861 @@ -1632,11 +1632,11 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" -"passwd ファイルを使用して、全リポジトリを単位にアクセス制限・許可を行います。リポジトリ内部のフォルダごとにアクセスを設定するような制御が必要なら、以下の行のコメントアウトを解除し、Subversion アクセスファイルを作成してくださいてください。\n" +"passwd ファイルを使用して、全リポジトリを単位にアクセス制限・許可を行います。リポジトリ内部のフォルダごとにアクセスを設定するような制御が必要なら、以下の行のコメントアウトを解除し、Git アクセスファイルを作成してくださいてください。\n" "#AuthzSVNAccessFile svnaccessfile\n" -"Apache は確実に、有効なユーザのみが /svn にアクセスできるようにします。また、Subversion の AuthzSVNAccessFile モジュールにユーザ名を渡し、Subversion アクセスファイルに列挙したルールに基づく、よりきめの細かいアクセス制御を行うことができます。パスが repos:path か、単に path として指定されるのに注意してください。特定のリポジトリを指定しない場合、アクセスルールは SVNParentPath の下のすべてのリポジトリに適用されます。mod_authz_svn で使用する認証ポリシーファイルの書式は、 で説明しています。" +"Apache は確実に、有効なユーザのみが /svn にアクセスできるようにします。また、Git の AuthzSVNAccessFile モジュールにユーザ名を渡し、Git アクセスファイルに列挙したルールに基づく、よりきめの細かいアクセス制御を行うことができます。パスが repos:path か、単に path として指定されるのに注意してください。特定のリポジトリを指定しない場合、アクセスルールは SVNParentPath の下のすべてのリポジトリに適用されます。mod_authz_svn で使用する認証ポリシーファイルの書式は、 で説明しています。" #. (para) #: ../source/TortoiseGit_en.xml:1915 @@ -1676,13 +1676,13 @@ msgstr "プロジェクトのインデックス" #. (para) #: ../source/TortoiseGit_en.xml:1955 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." msgstr "SVNParentPath ディレクティブを使用する場合、新しいリポジトリを作成する際に Apache 設定ファイルを変更する必要はありません。単にはじめのリポジトリと同じ場所に、新しいリポジトリを作成してください。これで終わりです! 筆者の会社では、SMB (通常の Windows ファイルアクセス) で指定のフォルダに直接アクセスできています。ここに新しいフォルダを作成し、TortoiseGit コマンド TortoiseGitここにリポジトリを作成... を実行すると新しいプロジェクトのホームができます..." #. (para) #: ../source/TortoiseGit_en.xml:1969 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." -msgstr "Subversion 1.3 以降を使用している場合、ブラウザで個々のリポジトリを指定するのではなく上位パスを指定して、有効なプロジェクトの一覧を Apache が表示できるよう、SVNListParentPath on ディレクティブを使用できます。" +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgstr "Git 1.3 以降を使用している場合、ブラウザで個々のリポジトリを指定するのではなく上位パスを指定して、有効なプロジェクトの一覧を Apache が表示できるよう、SVNListParentPath on ディレクティブを使用できます。" #. (title) #: ../source/TortoiseGit_en.xml:1977 @@ -1696,8 +1696,8 @@ msgstr "認証" #. (para) #: ../source/TortoiseGit_en.xml:1984 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." -msgstr "mod_authz_svn モジュールは、ユーザ名とリポジトリパスを元にしたアクセス制限のきめ細かい制御を行えます。これは Apache サーバで利用でき、また Subversion 1.3 では svnserve でも同様に利用できます。" +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." +msgstr "mod_authz_svn モジュールは、ユーザ名とリポジトリパスを元にしたアクセス制限のきめ細かい制御を行えます。これは Apache サーバで利用でき、また Git 1.3 では svnserve でも同様に利用できます。" #. (para) #: ../source/TortoiseGit_en.xml:1990 @@ -1835,7 +1835,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1849,7 +1849,7 @@ msgid "" "SSPIOfferBasic On\n" " within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" -"Subversion ロケーションがこのタイプの認証を使用するように、\n" +"Git ロケーションがこのタイプの認証を使用するように、\n" "AuthType Basic\n" " を \n" "AuthType SSPI\n" @@ -1880,8 +1880,8 @@ msgstr "SSL を有効にするには、AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." -msgstr "Subversion の AuthzSVNAccessFile ファイルではユーザ名の大文字小文字は区別します。(\"JUser\" と \"juser\" は異なります)" +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgstr "Git の AuthzSVNAccessFile ファイルではユーザ名の大文字小文字は区別します。(\"JUser\" と \"juser\" は異なります)" #. (para) #: ../source/TortoiseGit_en.xml:2145 @@ -1890,8 +1890,8 @@ msgstr "Microsoft の世界では、Windows ドメインとユーザ名は大文 #. (para) #: ../source/TortoiseGit_en.xml:2150 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." -msgstr "Windows ドメインとユーザ名をユーザが入力したとおりに Subversionに渡して SSPI 認証を行う場合、この違いは悪影響を与えます。インターネットエクスプローラは Apache にアカウント作成時の形に自動で整形して渡します。" +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgstr "Windows ドメインとユーザ名をユーザが入力したとおりに Gitに渡して SSPI 認証を行う場合、この違いは悪影響を与えます。インターネットエクスプローラは Apache にアカウント作成時の形に自動で整形して渡します。" #. (para) #: ../source/TortoiseGit_en.xml:2158 @@ -1900,8 +1900,8 @@ msgstr "結論としては、AuthzSVNAccessFile にユーザ #. (para) #: ../source/TortoiseGit_en.xml:2166 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." -msgstr "Apache のエラーログとアクセスログは、こういった問題を読み解き Subversion の AuthzSVNAccessFile モジュールに渡すユーザ名の文字列を決めるのを助ける相棒といえます。すべてが動作するには、svnaccessfile 内のユーザ文字列の正しいフォーマット (例: DOMAIN\\user vs. DOMAIN//user) をテストする必要があります。" +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgstr "Apache のエラーログとアクセスログは、こういった問題を読み解き Git の AuthzSVNAccessFile モジュールに渡すユーザ名の文字列を決めるのを助ける相棒といえます。すべてが動作するには、svnaccessfile 内のユーザ文字列の正しいフォーマット (例: DOMAIN\\user vs. DOMAIN//user) をテストする必要があります。" #. (title) #: ../source/TortoiseGit_en.xml:2180 @@ -1915,8 +1915,8 @@ msgstr "マルチ認証" #. (para) #: ../source/TortoiseGit_en.xml:2184 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." -msgstr "また、Subversion リポジトリに複数の認証ソースを持つこともできます。それには、いずれの認証タイプも権威を持たないようにします。すると Apache は、ユーザ名とパスワードの検証に、複数のソースをチェックするようになります。" +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgstr "また、Git リポジトリに複数の認証ソースを持つこともできます。それには、いずれの認証タイプも権威を持たないようにします。すると Apache は、ユーザ名とパスワードの検証に、複数のソースをチェックするようになります。" #. (para) #: ../source/TortoiseGit_en.xml:2190 @@ -1945,7 +1945,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1970,7 +1970,7 @@ msgstr "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2097,13 +2097,13 @@ msgstr "SSL とインターネットエクスプローラ" #. (para) #: ../source/TortoiseGit_en.xml:2339 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." -msgstr "SSL を使用してサーバを安全にしようとしたり、Windows ドメインの認証を使用する場合、インターネットエクスプローラでリポジトリを閲覧するのはうまくいきません。が、心配しないでください。インターネットエクスプローラが認証できないだけです。他のブラウザにはこの問題はありませんし、TortoiseGit やその他の Subversion クライアントは認証できます。" +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." +msgstr "SSL を使用してサーバを安全にしようとしたり、Windows ドメインの認証を使用する場合、インターネットエクスプローラでリポジトリを閲覧するのはうまくいきません。が、心配しないでください。インターネットエクスプローラが認証できないだけです。他のブラウザにはこの問題はありませんし、TortoiseGit やその他の Git クライアントは認証できます。" #. (para) #: ../source/TortoiseGit_en.xml:2353 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." -msgstr "Apache 設定ファイルの <Location /path> ディレクティブで区切り SSPIBasicPreferred On と定義してください。IE でも認証できるようになります。しかし、他のブラウザや Subversion はこの location で認証ができなくなります。" +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." +msgstr "Apache 設定ファイルの <Location /path> ディレクティブで区切り SSPIBasicPreferred On と定義してください。IE でも認証できるようになります。しかし、他のブラウザや Git はこの location で認証ができなくなります。" #. (para) #: ../source/TortoiseGit_en.xml:2363 @@ -2137,8 +2137,8 @@ msgstr "SSL アクセスの強制" #. (para) #: ../source/TortoiseGit_en.xml:2395 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." -msgstr "リポジトリが安全になるよう SSL をセットアップするにあたり、通常の非 SSL (http) アクセスを無効にして、https のみを許可したいかもしれません。このため、Subversion の <Location> ブロックに別のディレクティブ SSLRequireSSL を追加しなければなりません。" +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." +msgstr "リポジトリが安全になるよう SSL をセットアップするにあたり、通常の非 SSL (http) アクセスを無効にして、https のみを許可したいかもしれません。このため、Git の <Location> ブロックに別のディレクティブ SSLRequireSSL を追加しなければなりません。" #. (para) #: ../source/TortoiseGit_en.xml:2402 @@ -2149,7 +2149,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2162,7 +2162,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2181,8 +2181,8 @@ msgstr "Nigel Green さんが TortoiseGit のメーリングリストに投稿 #. (para) #: ../source/TortoiseGit_en.xml:2424 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." -msgstr "サーバの構成によっては、2 つ仮想 SSL ホストをひとつのサーバにセットアップする必要があるかも知れません。ひとつはクライアント証明書のいらず、web アクセスが公開されています。二つ目はクライアント証明書が必要な安全なサーバで、Subversion サーバを動作させています。" +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." +msgstr "サーバの構成によっては、2 つ仮想 SSL ホストをひとつのサーバにセットアップする必要があるかも知れません。ひとつはクライアント証明書のいらず、web アクセスが公開されています。二つ目はクライアント証明書が必要な安全なサーバで、Git サーバを動作させています。" #. (para) #: ../source/TortoiseGit_en.xml:2430 @@ -2192,11 +2192,11 @@ msgstr "SSLVerifyClient Optional ディレクティブを、A #. (para) #: ../source/TortoiseGit_en.xml:2440 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" -"解決策は、Subversion でロックしたい仮想ホストのディレクトリに、以下のディレクティブを追加することです。\n" +"解決策は、Git でロックしたい仮想ホストのディレクトリに、以下のディレクティブを追加することです。\n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " クライアント証明書を受け取り、検証に成功した場合だけ、このディレクティブは、そのディレクトリへのアクセスを許可します。" @@ -2214,10 +2214,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2239,10 +2239,10 @@ msgstr "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2260,8 +2260,8 @@ msgstr "svnserve ベースのサーバ" #. (para) #: ../source/TortoiseGit_en.xml:2485 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." -msgstr "サーバに Apache を使用できない状況にあるかもしれません。幸い、Subversion には Svnserve (通常の TCP/IP 接続上でカスタムプロトコルを使用する、軽快なスタンドアロンサーバ) が含まれています。" +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgstr "サーバに Apache を使用できない状況にあるかもしれません。幸い、Git には Svnserve (通常の TCP/IP 接続上でカスタムプロトコルを使用する、軽快なスタンドアロンサーバ) が含まれています。" #. (para) #: ../source/TortoiseGit_en.xml:2491 @@ -2275,23 +2275,23 @@ msgstr "svnserve のインストール" #. (para) #: ../source/TortoiseGit_en.xml:2502 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." -msgstr "Subversion の最新版は、http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 から取得してください。またはパッケージ化済みインストーラを、CollabNet の http://www.collab.net/downloads/subversion から取得してください。このインストーラは、svnserve を Windows サービスとしてセットアップし、セキュリティのために SASL を使う場合に必要となるいくつかのツールも含んでいます。" +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgstr "Git の最新版は、http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91 から取得してください。またはパッケージ化済みインストーラを、CollabNet の http://www.collab.net/downloads/Git から取得してください。このインストーラは、svnserve を Windows サービスとしてセットアップし、セキュリティのために SASL を使う場合に必要となるいくつかのツールも含んでいます。" #. (para) #: ../source/TortoiseGit_en.xml:2516 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." -msgstr "既に Subversion をインストールしてあり、svnserve が稼働している場合、継続する前に停止する必要があります。" +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." +msgstr "既に Git をインストールしてあり、svnserve が稼働している場合、継続する前に停止する必要があります。" #. (para) #: ../source/TortoiseGit_en.xml:2522 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." -msgstr "Subversion インストーラを実行します。サーバ上で実行しているなら (お勧め)、ステップ 4 までスキップできます。" +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." +msgstr "Git インストーラを実行します。サーバ上で実行しているなら (お勧め)、ステップ 4 までスキップできます。" #. (para) #: ../source/TortoiseGit_en.xml:2528 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "Windows エクスプローラを開き、Subversion のインストールディレクトリ (通常 C:\\Program Files\\Subversion) にある bin ディレクトリに行ってください。svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll, ssleay32.dll があるのでこのファイルか、bin ディレクトリのすべてのファイルをサーバ用のディレクトリ (例: c:\\svnserve) にコピーしてください。" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "Windows エクスプローラを開き、Git のインストールディレクトリ (通常 C:\\Program Files\\Git) にある bin ディレクトリに行ってください。svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll, ssleay32.dll があるのでこのファイルか、bin ディレクトリのすべてのファイルをサーバ用のディレクトリ (例: c:\\svnserve) にコピーしてください。" #. (title) #: ../source/TortoiseGit_en.xml:2550 @@ -2361,36 +2361,36 @@ msgstr "svnserve をサービスとして実行" #. (para) #: ../source/TortoiseGit_en.xml:2624 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." -msgstr "ユーザが svnserve を実行するのは、通常、最善の方法というわけではありません。サーバに常にユーザがログインすることになり、リブート後には、svnserve を再起動するのを忘れないようにしなければならないのです。よりよい方法は、svnserve を Windows サービスとして実行することです。Subversion 1.4 で開始すると、svnserve は ネイティブな Windows サービスとしてインストールできます。" +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." +msgstr "ユーザが svnserve を実行するのは、通常、最善の方法というわけではありません。サーバに常にユーザがログインすることになり、リブート後には、svnserve を再起動するのを忘れないようにしなければならないのです。よりよい方法は、svnserve を Windows サービスとして実行することです。Git 1.4 で開始すると、svnserve は ネイティブな Windows サービスとしてインストールできます。" #. (para) #: ../source/TortoiseGit_en.xml:2631 msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "svnserve をネイティブ Windows サービスとしてインストールするには、以下のコマンドを 1 行で記述し、Windows の起動時に自動起動するサービスを作成してください。\n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " パスにスペースを含んでいる場合は、以下のように、(エスケープした) クォートでパスを囲んでください。\n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " サービス作成後に、説明の追加もできます。これは Windows のサービスマネージャに表示されます。\n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" #. (para) @@ -2403,11 +2403,11 @@ msgstr "sc で使用するコマンドラインフォーマ msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "現在 Microsoft はサービスを、ローカルサービスアカウントかネットワークサービスアカウントのどちらかで動作させるのを推奨しています。サービスおよびサービス アカウントのセキュリティ計画ガイド をご覧ください。ローカルサービスアカウントで動作するサービスを作成するには、上記の例に以下を加えてください。\n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" ローカルサービスアカウントには、Subversion とそのリポジトリに適切な権限を与え、またフックスクリプトで使用するアプリケーションにも同様に権限を与える必要があることに注意してください。ビルトイングループは、\"LOCAL SERVICE\" と呼ばれています。" +" ローカルサービスアカウントには、Git とそのリポジトリに適切な権限を与え、またフックスクリプトで使用するアプリケーションにも同様に権限を与える必要があることに注意してください。ビルトイングループは、\"LOCAL SERVICE\" と呼ばれています。" #. (para) #: ../source/TortoiseGit_en.xml:2678 @@ -2485,8 +2485,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2755 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" -msgstr "同一のパスワードデータベースで複数のリポジトリを保守する場合、認証レルムを使用すると (TortoiseGit が資格証明をキャッシュできるので 1 度入力すればよいため) 楽になります。詳細な情報は Subversion book の、特に Create a 'users' file and realm 節や、Client Credentials Caching 節にあります" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgstr "同一のパスワードデータベースで複数のリポジトリを保守する場合、認証レルムを使用すると (TortoiseGit が資格証明をキャッシュできるので 1 度入力すればよいため) 楽になります。詳細な情報は Git book の、特に Create a 'users' file and realm 節や、Client Credentials Caching 節にあります" #. (title) #: ../source/TortoiseGit_en.xml:2773 @@ -2505,13 +2505,13 @@ msgstr "SASL とは?" #. (para) #: ../source/TortoiseGit_en.xml:2779 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." -msgstr "Cyrus Simple Authentication and Security Layer は、カーネギーメロン大学で書かれたオープンソースソフトウェアです。これは、いくつものネットワークプロトコル (と Subversion 1.5 以降) に汎用認証機構と暗号化機能を追加し、svnserve サーバと TortoiseGit クライアントは、どちらもこのライブラリを利用できます。" +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgstr "Cyrus Simple Authentication and Security Layer は、カーネギーメロン大学で書かれたオープンソースソフトウェアです。これは、いくつものネットワークプロトコル (と Git 1.5 以降) に汎用認証機構と暗号化機能を追加し、svnserve サーバと TortoiseGit クライアントは、どちらもこのライブラリを利用できます。" #. (para) #: ../source/TortoiseGit_en.xml:2787 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." -msgstr "有効なオプションのより完全な議論のために、Subversion book の Using svnserve with SASL 節を見るべきです。Windows サーバで安全な認証や暗号化をセットアップする、簡単な方法を探しているだけであれば、巨悪であるインターネット経由で、リポジトリへ安全にアクセスするために読み進めてください。" +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgstr "有効なオプションのより完全な議論のために、Git book の Using svnserve with SASL 節を見るべきです。Windows サーバで安全な認証や暗号化をセットアップする、簡単な方法を探しているだけであれば、巨悪であるインターネット経由で、リポジトリへ安全にアクセスするために読み進めてください。" #. (title) #: ../source/TortoiseGit_en.xml:2800 @@ -2531,13 +2531,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2810 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." -msgstr "ふたつ目は、svn.conf ファイルを好みの場所 (たいてい subversion をインストールしたディレクトリ) に作成することです。" +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." +msgstr "ふたつ目は、svn.conf ファイルを好みの場所 (たいてい Git をインストールしたディレクトリ) に作成することです。" #. (para) #: ../source/TortoiseGit_en.xml:2815 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." -msgstr "みっつ目は、SASL が見つけられるように、ふたつの新しいレジストリエントリを作成することです。[HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] というレジストリキーを作成し、その中に以下のふたつの string 値を配置してください。SearchPath に sasl*.dll プラグインを含むディレクトリパス (通常 Subversion をインストールしたディレクトリ) と、ConfFile に svn.conf ファイルを含むディレクトリです。CollabNet のインストーラを使用している場合、そのレジストリキーはすでに作成されています。" +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgstr "みっつ目は、SASL が見つけられるように、ふたつの新しいレジストリエントリを作成することです。[HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] というレジストリキーを作成し、その中に以下のふたつの string 値を配置してください。SearchPath に sasl*.dll プラグインを含むディレクトリパス (通常 Git をインストールしたディレクトリ) と、ConfFile に svn.conf ファイルを含むディレクトリです。CollabNet のインストーラを使用している場合、そのレジストリキーはすでに作成されています。" #. (para) #: ../source/TortoiseGit_en.xml:2827 @@ -2626,8 +2626,8 @@ msgstr "サーバをセットアップする基本的な方法は、Version Control with Subversion." -msgstr "svnserve のさらなる情報は Version Control with Subversion にあります。" +msgid "Further information about svnserve can be found in the Version Control with Git." +msgstr "svnserve のさらなる情報は Version Control with Git にあります。" #. (title) #: ../source/TortoiseGit_en.xml:2923 @@ -2637,25 +2637,25 @@ msgstr "svnserve でのパスベース認証" #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" -"Subversion 1.3 で起動すると、svnserve は、Apache サーバで有効な mod_authz_svn パスベース認証方式と同じものをサポートします。リポジトリディレクトリにある conf/svnserve.conf ファイルを編集し、認証ファイルを参照する行を追加する必要があります。\n" +"Git 1.3 で起動すると、svnserve は、Apache サーバで有効な mod_authz_svn パスベース認証方式と同じものをサポートします。リポジトリディレクトリにある conf/svnserve.conf ファイルを編集し、認証ファイルを参照する行を追加する必要があります。\n" "[general]\n" "authz-db = authz\n" " authz には、作成したアクセス制限を定義したファイルを指定してください。リポジトリごとに独立したファイルを使用できますし、複数のリポジトリで同じファイルを使用することもできます。ファイル形式の説明については、 をご覧ください。" #. (para) #: ../source/TortoiseGit_en.xml:2946 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." -msgstr "リポジトリへアクセスするのにどのプロトコルを使用しても、最低 1 つはリポジトリを作成する必要があります。Subversion コマンドラインクライアントでも、TortoiseGit でも作成できます。" +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." +msgstr "リポジトリへアクセスするのにどのプロトコルを使用しても、最低 1 つはリポジトリを作成する必要があります。Git コマンドラインクライアントでも、TortoiseGit でも作成できます。" #. (para) #: ../source/TortoiseGit_en.xml:2951 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "まだ Subversion のリポジトリを作成していないのなら、さっそく作成しましょう。" +msgid "If you haven't created a Git repository yet, it's time to do that now." +msgstr "まだ Git のリポジトリを作成していないのなら、さっそく作成しましょう。" #. (title) #: ../source/TortoiseGit_en.xml:2959 @@ -2669,8 +2669,8 @@ msgstr "リポジトリ作成" #. (para) #: ../source/TortoiseGit_en.xml:2963 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." -msgstr "リポジトリを作成するのに FSFS バックエンドか、より古い Berkeley Database (BDB) フォーマットで作成できます。FSFS フォーマットは一般的に高速で、管理しやすく、ネットワーク共有や Windows98 でも問題なく動作します。BDB フォーマットは長い間テストされてきているので安定していると考えられてきましたが、FSFS にも数年の使用実績があるため、その主張も弱くなってきています。詳細は Subversion Book の Choosing a Data Store をご覧ください。" +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." +msgstr "リポジトリを作成するのに FSFS バックエンドか、より古い Berkeley Database (BDB) フォーマットで作成できます。FSFS フォーマットは一般的に高速で、管理しやすく、ネットワーク共有や Windows98 でも問題なく動作します。BDB フォーマットは長い間テストされてきているので安定していると考えられてきましたが、FSFS にも数年の使用実績があるため、その主張も弱くなってきています。詳細は Git Book の Choosing a Data Store をご覧ください。" #. (title) #: ../source/TortoiseGit_en.xml:2978 @@ -2781,8 +2781,8 @@ msgstr "UNC パス" #. (para) #: ../source/TortoiseGit_en.xml:3094 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." -msgstr "ローカルリポジトリにアクセスするには、そのフォルダへのパスが必要です。Subversion はすべてリポジトリのパスを file:///C:/SVNRepository/ という形で表すことを覚えておいてください。一貫してスラッシュ (\"/\") を使用することに注意してください。" +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgstr "ローカルリポジトリにアクセスするには、そのフォルダへのパスが必要です。Git はすべてリポジトリのパスを file:///C:/SVNRepository/ という形で表すことを覚えておいてください。一貫してスラッシュ (\"/\") を使用することに注意してください。" #. (para) #: ../source/TortoiseGit_en.xml:3100 @@ -2821,8 +2821,8 @@ msgstr "第一に、すべてのユーザにリポジトリへ直接書き込み #. (para) #: ../source/TortoiseGit_en.xml:3141 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." -msgstr "第二に、すべてのネットワークファイル共有プロトコルが、Subversion が求めるロックをサポートしているわけではなく、リポジトリが壊れた状態に見える可能性があります。すぐには起こらないかも知れませんが、ある日 2 人のユーザが、同時にリポジトリにアクセスしようとすることもあるでしょう。" +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgstr "第二に、すべてのネットワークファイル共有プロトコルが、Git が求めるロックをサポートしているわけではなく、リポジトリが壊れた状態に見える可能性があります。すぐには起こらないかも知れませんが、ある日 2 人のユーザが、同時にリポジトリにアクセスしようとすることもあるでしょう。" #. (para) #: ../source/TortoiseGit_en.xml:3147 @@ -2925,8 +2925,8 @@ msgstr "トップレベルに /trunk /tags /branches アプ #. (para) #: ../source/TortoiseGit_en.xml:3220 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." -msgstr "関連がないプロジェクトはリポジトリを分けるという選択もあります。変更をコミットする際、リビジョン番号はプロジェクトごとに振られるのではなく、リポジトリ全体の変更に振られます。関連のない 2 つのプロジェクトがリポジトリを共有するとリビジョン番号に大きなギャップが生じます。Subversion プロジェクトと TortoiseGit プロジェクトは同じホストアドレスにありますが、独立して開発できるよう、またビルド番号で混乱しないようリポジトリが分けられています。" +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgstr "関連がないプロジェクトはリポジトリを分けるという選択もあります。変更をコミットする際、リビジョン番号はプロジェクトごとに振られるのではなく、リポジトリ全体の変更に振られます。関連のない 2 つのプロジェクトがリポジトリを共有するとリビジョン番号に大きなギャップが生じます。Git プロジェクトと TortoiseGit プロジェクトは同じホストアドレスにありますが、独立して開発できるよう、またビルド番号で混乱しないようリポジトリが分けられています。" #. (para) #: ../source/TortoiseGit_en.xml:3230 @@ -3014,8 +3014,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3332 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "Subversion コマンドラインクライアントをインストールすると、svnadmin が自動でインストールされています。Windows PC でコマンドラインツールをインストールする際に、一番いい方法は Windows installer 版をダウンロードすることです。.zip 版よりも効率よく圧縮されているため、ダウンロードサイズが小さく、適切なパス設定もしてくれます。Subversion コマンドラインクライアントの最新版は http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 からダウンロードできます。" +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "Git コマンドラインクライアントをインストールすると、svnadmin が自動でインストールされています。Windows PC でコマンドラインツールをインストールする際に、一番いい方法は Windows installer 版をダウンロードすることです。.zip 版よりも効率よく圧縮されているため、ダウンロードサイズが小さく、適切なパス設定もしてくれます。Git コマンドラインクライアントの最新版は http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91 からダウンロードできます。" #. (title) #: ../source/TortoiseGit_en.xml:3347 @@ -3041,8 +3041,8 @@ msgstr "サーバ側フックスクリプト" #. (para) #: ../source/TortoiseGit_en.xml:3357 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." -msgstr "フックスクリプトは、リポジトリのイベント (新しいリビジョンの作成やバージョン管理外の属性の変更など) を引き金に動作するプログラムです。いずれのフックも、イベントが何か、操作の対象は何か、イベントの引き金を引いた人物のユーザ名といった情報を受け取ります。フックの出力や終了ステータスによって、フックプログラムは動作の続行、停止、中断を切り替えることになります。実装されているフックについての詳細は、Subversion Book の Hook Scripts の章を参照してください。" +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." +msgstr "フックスクリプトは、リポジトリのイベント (新しいリビジョンの作成やバージョン管理外の属性の変更など) を引き金に動作するプログラムです。いずれのフックも、イベントが何か、操作の対象は何か、イベントの引き金を引いた人物のユーザ名といった情報を受け取ります。フックの出力や終了ステータスによって、フックプログラムは動作の続行、停止、中断を切り替えることになります。実装されているフックについての詳細は、Git Book の Hook Scripts の章を参照してください。" #. (para) #: ../source/TortoiseGit_en.xml:3372 @@ -3093,8 +3093,8 @@ msgstr "ウェブサイト" #. (para) #: ../source/TortoiseGit_en.xml:3411 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." -msgstr "Subversion リポジトリを他の人に利用できるようにするにあたり、自分のウェブサイトからリンクを張ることになるかもしれません。他の TortoiseGit のユーザにチェックアウトリンクを提供するというアクセスしやすい方法があります。" +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgstr "Git リポジトリを他の人に利用できるようにするにあたり、自分のウェブサイトからリンクを張ることになるかもしれません。他の TortoiseGit のユーザにチェックアウトリンクを提供するというアクセスしやすい方法があります。" #. (para) #: ../source/TortoiseGit_en.xml:3417 @@ -3159,18 +3159,18 @@ msgstr "日常操作ガイド" #. (para) #: ../source/TortoiseGit_en.xml:3457 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." -msgstr "このドキュメントは TortoiseGit クライアントの日々の使い方を説明しています。バージョン管理システムの解説ではなく、Subversion (SVN) の解説でもありません。だいたい何をしたいか分かっているなら、調べる場所として便利ですが、どのように行うかは全く思い出させてくれません。" +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgstr "このドキュメントは TortoiseGit クライアントの日々の使い方を説明しています。バージョン管理システムの解説ではなく、Git (SVN) の解説でもありません。だいたい何をしたいか分かっているなら、調べる場所として便利ですが、どのように行うかは全く思い出させてくれません。" #. (para) #: ../source/TortoiseGit_en.xml:3465 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." -msgstr "Subversion でのバージョン管理の解説が必要なら、Version Control with Subversion というすばらしい本をお薦めします。" +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." +msgstr "Git でのバージョン管理の解説が必要なら、Version Control with Git というすばらしい本をお薦めします。" #. (para) #: ../source/TortoiseGit_en.xml:3472 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." -msgstr "このドキュメントは、TortoiseGit や Subversion と同様、現在もまだ作成中です。間違いがあったら私たちが修正できるよう、メーリングリストに投稿してください。日常操作ガイド (DUG) のスクリーンショットの中には、現在のソフトウェアの状態を反映していないものがあるかもしれません。ご容赦ください。TortoiseGit の作業は空いた時間でしているのです。" +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgstr "このドキュメントは、TortoiseGit や Git と同様、現在もまだ作成中です。間違いがあったら私たちが修正できるよう、メーリングリストに投稿してください。日常操作ガイド (DUG) のスクリーンショットの中には、現在のソフトウェアの状態を反映していないものがあるかもしれません。ご容赦ください。TortoiseGit の作業は空いた時間でしているのです。" #. (para) #: ../source/TortoiseGit_en.xml:3484 @@ -3184,13 +3184,13 @@ msgstr "バージョン管理システムになじみがあることを前提に #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." -msgstr "Subversion の基本を知っていることを前提にします。" +msgid "You should know the basics of Git." +msgstr "Git の基本を知っていることを前提にします。" #. (para) #: ../source/TortoiseGit_en.xml:3499 -msgid "You should have set up a server and/or have access to a Subversion repository." -msgstr "サーバのセットアップを行っているかどうかして、Subversion のリポジトリにアクセスできることを前提にします。" +msgid "You should have set up a server and/or have access to a Git repository." +msgstr "サーバのセットアップを行っているかどうかして、Git のリポジトリにアクセスできることを前提にします。" #. (para) #: ../source/TortoiseGit_en.xml:3480 @@ -3379,13 +3379,13 @@ msgstr "svn.username には、(パスワードがいらな #. (para) #: ../source/TortoiseGit_en.xml:3650 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " -msgstr "アクセスしようとしているリポジトリがパスワードで保護されている場合、認証ダイアログが表示されます。 ユーザ名とパスワードを入力してください。TortoiseGit が証明書を Subversion のデフォルトディレクトリ (%APPDATA%\\Subversion\\auth) にある、以下の 3 つのサブディレクトリに格納するかどうかチェックボックスで指定できます。" +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " +msgstr "アクセスしようとしているリポジトリがパスワードで保護されている場合、認証ダイアログが表示されます。 ユーザ名とパスワードを入力してください。TortoiseGit が証明書を Git のデフォルトディレクトリ (%APPDATA%\\Git\\auth) にある、以下の 3 つのサブディレクトリに格納するかどうかチェックボックスで指定できます。" #. (para) #: ../source/TortoiseGit_en.xml:3681 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." -msgstr "全サーバの認証キャッシュをクリアしたければ、TortoiseGit 設定ダイアログの保存データ ページから行えます。このボタンで、以前のバージョンでレジストリに格納した認証情報と同様に、Subversion の auth ディレクトリからキャッシュされた認証データをクリアします。 をご覧ください。" +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgstr "全サーバの認証キャッシュをクリアしたければ、TortoiseGit 設定ダイアログの保存データ ページから行えます。このボタンで、以前のバージョンでレジストリに格納した認証情報と同様に、Git の auth ディレクトリからキャッシュされた認証データをクリアします。 をご覧ください。" #. (para) #: ../source/TortoiseGit_en.xml:3690 @@ -3460,8 +3460,8 @@ msgstr "間違ったフォルダ階層を、リポジトリに簡単にインポ #. (para) #: ../source/TortoiseGit_en.xml:3736 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." -msgstr "この節では、ディレクトリ階層をリポジトリへ一度にインポートするよう設計された、Subversion の import コマンドについて説明しています。これは動作しますが、以下のようにいくつか欠点があります。 このため、import コマンドをまったく使わず、むしろ、 で説明する、2 段階法に従うのをお勧めします。しかし、あなたは今、基本的な import コマンドがどのように動作するかを説明する場にいます……" +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgstr "この節では、ディレクトリ階層をリポジトリへ一度にインポートするよう設計された、Git の import コマンドについて説明しています。これは動作しますが、以下のようにいくつか欠点があります。 このため、import コマンドをまったく使わず、むしろ、 で説明する、2 段階法に従うのをお勧めします。しかし、あなたは今、基本的な import コマンドがどのように動作するかを説明する場にいます……" #. (para) #: ../source/TortoiseGit_en.xml:3768 @@ -3580,8 +3580,8 @@ msgstr "たとえば、TortoiseGit のビルドスクリプトを参照してく #. (para) #: ../source/TortoiseGit_en.xml:3916 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." -msgstr "ユーザが不安にならないように、TortoiseVars.bat を親フォルダの無視リストに追加してあります。つまり、Subversion の svn:ignore 属性をそのファイルにセットしています。これにより (バージョン管理外のファイルのよう) コミットごとに表示されることがなくなります。" +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgstr "ユーザが不安にならないように、TortoiseVars.bat を親フォルダの無視リストに追加してあります。つまり、Git の svn:ignore 属性をそのファイルにセットしています。これにより (バージョン管理外のファイルのよう) コミットごとに表示されることがなくなります。" #. (title) #: ../source/TortoiseGit_en.xml:3925 @@ -3608,17 +3608,17 @@ msgstr "時には、たくさんの異なるチェックアウトから作業コ #. (para) #: ../source/TortoiseGit_en.xml:3940 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" -"では /project1 の作業コピーを D:\\dev\\project1 にチェックアウトしましょう。D:\\dev\\project1 フォルダを選択し、右クリック してコンテキストメニューのWindows メニュープロパティ を選んでください。属性ダイアログが表示されます。次に Subversion タブを選択します。ここで属性を設定できます。追加... をクリックしてください。コンボボックスから svn:externals 属性を選択し、エディットボックスに 名前 url の形式か、特定のリビジョンを指定するなら、名前 -rREV urlの形式でリポジトリの URL を入力してください。1 行ずつ複数の外部参照プロジェクトを追加できます。URL とファイル名は適切にエスケープしなければならないことに注意してください。そうでなければ動作しません。たとえば、空白を全て %20 に置き換えなければなりません。この時、空白の入ったフォルダ名は使用できないことに注意してください。D:\\dev\\project1 に属性をセットしてあると仮定すると、\n" +"では /project1 の作業コピーを D:\\dev\\project1 にチェックアウトしましょう。D:\\dev\\project1 フォルダを選択し、右クリック してコンテキストメニューのWindows メニュープロパティ を選んでください。属性ダイアログが表示されます。次に Git タブを選択します。ここで属性を設定できます。追加... をクリックしてください。コンボボックスから svn:externals 属性を選択し、エディットボックスに 名前 url の形式か、特定のリビジョンを指定するなら、名前 -rREV urlの形式でリポジトリの URL を入力してください。1 行ずつ複数の外部参照プロジェクトを追加できます。URL とファイル名は適切にエスケープしなければならないことに注意してください。そうでなければ動作しません。たとえば、空白を全て %20 に置き換えなければなりません。この時、空白の入ったフォルダ名は使用できないことに注意してください。D:\\dev\\project1 に属性をセットしてあると仮定すると、\n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" 次いで 設定 をクリックしコミットしてください。作業コピーを更新すると、Subversion は D:\\dev\\project1\\sounds サブフォルダを作成し、sounds プロジェクトをチェックアウトします。また、D:\\dev\\project1\\quick graphs サブフォルダには graphics プロジェクトを含み、ネストした D:\\dev\\project1\\skins\\toolkit サブフォルダには、skin-maker プロジェクトのリビジョン 21 が入っています。" +" 次いで 設定 をクリックしコミットしてください。作業コピーを更新すると、Git は D:\\dev\\project1\\sounds サブフォルダを作成し、sounds プロジェクトをチェックアウトします。また、D:\\dev\\project1\\quick graphs サブフォルダには graphics プロジェクトを含み、ネストした D:\\dev\\project1\\skins\\toolkit サブフォルダには、skin-maker プロジェクトのリビジョン 21 が入っています。" #. (para) #: ../source/TortoiseGit_en.xml:3980 @@ -3646,8 +3646,8 @@ msgstr "svn:externals の定義に絶対 URL を使用し、 #. (para) #: ../source/TortoiseGit_en.xml:4016 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." -msgstr "このような問題を避けるため、Subversion クライアントバージョン 1.5 以降では、相対外部参照 URL をサポートします。相対 URL を指定する 4 つの異なる方法をサポートしています。以下の例では、2 つのリポジトリ (http://example.com/svn/repos-1 と http://example.com/svn/repos-2) があると仮定します。C:\\Working に http://example.com/svn/repos-1/project/trunk のチェックアウトがあり、トランクに svn:externals プロパティをセットしています。" +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgstr "このような問題を避けるため、Git クライアントバージョン 1.5 以降では、相対外部参照 URL をサポートします。相対 URL を指定する 4 つの異なる方法をサポートしています。以下の例では、2 つのリポジトリ (http://example.com/svn/repos-1 と http://example.com/svn/repos-2) があると仮定します。C:\\Working に http://example.com/svn/repos-1/project/trunk のチェックアウトがあり、トランクに svn:externals プロパティをセットしています。" #. (term) #: ../source/TortoiseGit_en.xml:4031 @@ -3875,8 +3875,8 @@ msgstr "Project25 に対して同じ手順を繰り返しま #. (para) #: ../source/TortoiseGit_en.xml:4298 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." -msgstr "Project76/SubProj に移動し、同様に行ってください。このとき Project76 フォルダには、これだけですべて配置する SubProj 以外に何も内容がないことに注意してください。Subversion は、内容の取得をせずに、中間フォルダのみ作成しました。" +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." +msgstr "Project76/SubProj に移動し、同様に行ってください。このとき Project76 フォルダには、これだけですべて配置する SubProj 以外に何も内容がないことに注意してください。Git は、内容の取得をせずに、中間フォルダのみ作成しました。" #. (title) #: ../source/TortoiseGit_en.xml:4308 @@ -3885,8 +3885,8 @@ msgstr "作業コピーの深度は減らせません" #. (para) #: ../source/TortoiseGit_en.xml:4309 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." -msgstr "一度作業コピーを特定の深度でチェックアウトすると、もっと内容を取得するように深度を増加できます。しかし、内容を削除するように深度を減少はできません。この機能は、Subversion の将来のバージョンで追加される可能性があります。" +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." +msgstr "一度作業コピーを特定の深度でチェックアウトすると、もっと内容を取得するように深度を増加できます。しかし、内容を削除するように深度を減少はできません。この機能は、Git の将来のバージョンで追加される可能性があります。" #. (title) #: ../source/TortoiseGit_en.xml:4317 @@ -4027,8 +4027,8 @@ msgstr "下のペインに表示された列は、カスタマイズできます #. (para) #: ../source/TortoiseGit_en.xml:4495 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." -msgstr "デフォルトでは変更をコミットする際に、保持していたファイルのロックが、コミット完了後自動的に開放されます。ロックを保持したままにしたい場合は、ロックを保持 チェックボックスにチェックしておきます。チェックボックスのデフォルト状態は、Subversion 設定ファイルの no_unlock オプションから取得します。Subversion 設定ファイルの編集については、 をご覧ください。" +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." +msgstr "デフォルトでは変更をコミットする際に、保持していたファイルのロックが、コミット完了後自動的に開放されます。ロックを保持したままにしたい場合は、ロックを保持 チェックボックスにチェックしておきます。チェックボックスのデフォルト状態は、Git 設定ファイルの no_unlock オプションから取得します。Git 設定ファイルの編集については、 をご覧ください。" #. (para) #: ../source/TortoiseGit_en.xml:4506 @@ -4051,8 +4051,8 @@ msgstr "外部での名前変更の修復" #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5337 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Subversion の外部でファイルの名前が変更されることがあり、その場合、ファイル一覧で紛失ファイルとして表示されたり、バージョン管理外ファイルとして表示されます。履歴を失わないように Subversion に関連を通知する必要があります。単純に古い名前 (紛失) と 新しい名前 (バージョン管理外) を選択し、コンテキストメニュー移動を修復 を用いて 2 つのファイルが名前変更であると指定してください。" +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Git の外部でファイルの名前が変更されることがあり、その場合、ファイル一覧で紛失ファイルとして表示されたり、バージョン管理外ファイルとして表示されます。履歴を失わないように Git に関連を通知する必要があります。単純に古い名前 (紛失) と 新しい名前 (バージョン管理外) を選択し、コンテキストメニュー移動を修復 を用いて 2 つのファイルが名前変更であると指定してください。" #. (title) #. (title) @@ -4063,8 +4063,8 @@ msgstr "変更リスト" #. (para) #: ../source/TortoiseGit_en.xml:4539 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." -msgstr "コミットダイアログは、関連するファイルのグループ化を助ける Subversion の変更リスト機能をサポートしています。この機能については、 をご覧ください。" +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." +msgstr "コミットダイアログは、関連するファイルのグループ化を助ける Git の変更リスト機能をサポートしています。この機能については、 をご覧ください。" #. (title) #: ../source/TortoiseGit_en.xml:4546 @@ -4347,8 +4347,8 @@ msgstr "既存のローカルファイル" #. (para) #: ../source/TortoiseGit_en.xml:4881 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." -msgstr "更新していると時々、手元に同じ名前のファイルがあるというメッセージを出して、更新が失敗することがあります。典型的には、Subversion で新しいバージョンのファイルを取得したときに、すでに作業フォルダにバージョン管理外の同じ名前のファイルがある場合に発生します。Subversion がバージョン管理外のファイルを上書きすることはありません。偶然他の開発者が同じファイル名で作成し、コミットしてしまった場合など、あなたの作業した内容が何か含まれているかもしれないからです。" +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgstr "更新していると時々、手元に同じ名前のファイルがあるというメッセージを出して、更新が失敗することがあります。典型的には、Git で新しいバージョンのファイルを取得したときに、すでに作業フォルダにバージョン管理外の同じ名前のファイルがある場合に発生します。Git がバージョン管理外のファイルを上書きすることはありません。偶然他の開発者が同じファイル名で作成し、コミットしてしまった場合など、あなたの作業した内容が何か含まれているかもしれないからです。" #. (para) #: ../source/TortoiseGit_en.xml:4890 @@ -4397,27 +4397,27 @@ msgstr "filename.ext.rNEWREV" #. (para) #: ../source/TortoiseGit_en.xml:4960 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." -msgstr "作業コピーを更新したときに Subversion クライアントが受信したファイルです。リポジトリの最新 (HEAD) リビジョンに相当します。" +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgstr "作業コピーを更新したときに Git クライアントが受信したファイルです。リポジトリの最新 (HEAD) リビジョンに相当します。" #. (para) #: ../source/TortoiseGit_en.xml:4915 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" -"時々、リポジトリからファイルを更新すると 競合 という状態になることがあります。競合は複数の開発者が、あるファイルの同じ行を変更した際に発生します。Subversion はプロジェクトについては何も知りませんから、開発者間の競合については解決できません。競合が報告されたら、問題のファイルを開き、<<<<<<< で始まる行を探してください。競合のある箇所は以下のようにマークがつけられています。\n" +"時々、リポジトリからファイルを更新すると 競合 という状態になることがあります。競合は複数の開発者が、あるファイルの同じ行を変更した際に発生します。Git はプロジェクトについては何も知りませんから、開発者間の競合については解決できません。競合が報告されたら、問題のファイルを開き、<<<<<<< で始まる行を探してください。競合のある箇所は以下のようにマークがつけられています。\n" "<<<<<<< filename\n" " あなたの変更\n" "=======\n" " リポジトリからマージされたコード\n" ">>>>>>> revision\n" -" また、競合のあるファイルごとに Subversion は手元のディレクトリにファイルを 3 つ追加します。" +" また、競合のあるファイルごとに Git は手元のディレクトリにファイルを 3 つ追加します。" #. (para) #: ../source/TortoiseGit_en.xml:4970 @@ -4431,8 +4431,8 @@ msgstr "その後、TortoiseGit問 #. (para) #: ../source/TortoiseGit_en.xml:4994 -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." -msgstr "バイナリファイルが競合した場合、Subversion はそのファイルをマージしようとしません。手元のファイルには変更を加えず (あなたが変更したままを保証)、filename.ext.r* ファイルを作ります。自分の変更を破棄し、リポジトリのバージョンにしたい場合は、「元に戻す」コマンドを使うだけです。リポジトリのバージョンを自分の変更したファイルで置き換えるのなら、「問題の解消」コマンドを行ってコミットしてください。" +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgstr "バイナリファイルが競合した場合、Git はそのファイルをマージしようとしません。手元のファイルには変更を加えず (あなたが変更したままを保証)、filename.ext.r* ファイルを作ります。自分の変更を破棄し、リポジトリのバージョンにしたい場合は、「元に戻す」コマンドを使うだけです。リポジトリのバージョンを自分の変更したファイルで置き換えるのなら、「問題の解消」コマンドを行ってコミットしてください。" #. (para) #: ../source/TortoiseGit_en.xml:5004 @@ -4480,13 +4480,13 @@ msgstr "アイコン" #. (para) #: ../source/TortoiseGit_en.xml:5046 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "今、Subversion リポジトリから作業コピーにチェックアウトしたとすると、Windows エクスプローラ上でファイルのアイコンが変わっていることと思います。これこそ TortoiseGit の評判がいい理由のひとつです。TortoiseGit はオーバーレイアイコンと呼ばれるアイコンを、元のファイルアイコンの上に重ねて表示します。ファイルの Subversion 状態によってオーバーレイアイコンが変わります。" +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." +msgstr "今、Git リポジトリから作業コピーにチェックアウトしたとすると、Windows エクスプローラ上でファイルのアイコンが変わっていることと思います。これこそ TortoiseGit の評判がいい理由のひとつです。TortoiseGit はオーバーレイアイコンと呼ばれるアイコンを、元のファイルアイコンの上に重ねて表示します。ファイルの Git 状態によってオーバーレイアイコンが変わります。" #. (para) #: ../source/TortoiseGit_en.xml:5054 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " 作業コピーにチェックアウトしたばかりのファイルには緑のチェックマークをオーバーレイします。Subversion の状態は 通常 です。" +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " 作業コピーにチェックアウトしたばかりのファイルには緑のチェックマークをオーバーレイします。Git の状態は 通常 です。" #. (para) #: ../source/TortoiseGit_en.xml:5059 @@ -4500,13 +4500,13 @@ msgstr " 更新中に If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." -msgstr " ファイルに svn:needs-lock 属性をセットしていると、そのファイルにロックをかけるまで Subversion は読み取り専用にします。この読み取り専用ファイルには、編集前にロックするまで、このオーバーレイを表示します。" +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgstr " ファイルに svn:needs-lock 属性をセットしていると、そのファイルにロックをかけるまで Git は読み取り専用にします。この読み取り専用ファイルには、編集前にロックするまで、このオーバーレイを表示します。" #. (para) #: ../source/TortoiseGit_en.xml:5079 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." -msgstr " ファイルをロックして Subversion 状態が 通常 ならこのアイコンが表示され、他の人がそのフィルへの変更をコミットしても良いのにロックを解放忘れをしないようにしてくれます。" +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgstr " ファイルをロックして Git 状態が 通常 ならこのアイコンが表示され、他の人がそのフィルへの変更をコミットしても良いのにロックを解放忘れをしないようにしてくれます。" #. (para) #: ../source/TortoiseGit_en.xml:5086 @@ -4540,8 +4540,8 @@ msgstr "現在では、たくさんの Tortoise クライアントが存在す #. (para) #: ../source/TortoiseGit_en.xml:5124 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." -msgstr "Subversion の状態に対応するアイコンオーバーレイの付き方や、その他の技術詳細は、 をご覧ください。" +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." +msgstr "Git の状態に対応するアイコンオーバーレイの付き方や、その他の技術詳細は、 をご覧ください。" #. (title) #: ../source/TortoiseGit_en.xml:5131 @@ -4977,8 +4977,8 @@ msgstr "選択したリビジョンのログ詳細をクリップボードにコ #. (para) #: ../source/TortoiseGit_en.xml:5742 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." -msgstr "入力したテキストでログメッセージを検索できます。入力したログメッセージと、Subversion が作成した動作概要 (下部ペインに表示) も検索範囲になります。大文字小文字は区別しません。" +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." +msgstr "入力したテキストでログメッセージを検索できます。入力したログメッセージと、Git が作成した動作概要 (下部ペインに表示) も検索範囲になります。大文字小文字は区別しません。" #. (para) #: ../source/TortoiseGit_en.xml:5581 @@ -5064,8 +5064,8 @@ msgstr "このリビジョンの選択したファイルへの変更を、元に #. (para) #: ../source/TortoiseGit_en.xml:5843 -msgid "View the Subversion properties for the selected item." -msgstr "選択した項目の Subversion 属性を表示します。" +msgid "View the Git properties for the selected item." +msgstr "選択した項目の Git 属性を表示します。" #. (para) #: ../source/TortoiseGit_en.xml:5848 @@ -5089,18 +5089,18 @@ msgstr "私たちが変更と言ったり差分と言ったりしていること #. (para) #: ../source/TortoiseGit_en.xml:5865 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." -msgstr "Subversion は、2 つの異なるものを表すのにリビジョン番号を使用します。一般的にリビジョンはその時点でのリポジトリの状態を表しますが、そのリビジョンで作成されたチェンジセットを表すのにも使用します。例えば r1234 で完了 と言ったときには、r1234 でコミットした実装した機能 X の変更と言う意味になります。どの意味で使用しているかをはっきりさせるために、2 つの用語を使い分けています。" +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgstr "Git は、2 つの異なるものを表すのにリビジョン番号を使用します。一般的にリビジョンはその時点でのリポジトリの状態を表しますが、そのリビジョンで作成されたチェンジセットを表すのにも使用します。例えば r1234 で完了 と言ったときには、r1234 でコミットした実装した機能 X の変更と言う意味になります。どの意味で使用しているかをはっきりさせるために、2 つの用語を使い分けています。" #. (para) #: ../source/TortoiseGit_en.xml:5874 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." -msgstr "リビジョン N とリビジョン M を選択すると、その2つのリビジョンの 差分 をコンテキストメニューで表示するようになります。Subversion 用語で、これは diff -r M:N となります。" +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." +msgstr "リビジョン N とリビジョン M を選択すると、その2つのリビジョンの 差分 をコンテキストメニューで表示するようになります。Git 用語で、これは diff -r M:N となります。" #. (para) #: ../source/TortoiseGit_en.xml:5880 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." -msgstr "リビジョン N を選択した場合、そのリビジョンで行った 変更 をコンテキストメニューで表示するようになります。Subversion 用語で、これは diff -r N-1:N や diff -c N となります。" +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." +msgstr "リビジョン N を選択した場合、そのリビジョンで行った 変更 をコンテキストメニューで表示するようになります。Git 用語で、これは diff -r N-1:N や diff -c N となります。" #. (para) #: ../source/TortoiseGit_en.xml:5886 @@ -5134,8 +5134,8 @@ msgstr "マージダイアログからログ参照ダイアログを表示する #. (para) #: ../source/TortoiseGit_en.xml:5935 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." -msgstr "Subversion は現在、名前の変更をコピー・削除で行います。そのため、このオプションにチェックがついていると、ファイルやフォルダの名前を変更している所でログの表示が停止するということに注意してください" +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgstr "Git は現在、名前の変更をコピー・削除で行います。そのため、このオプションにチェックがついていると、ファイルやフォルダの名前を変更している所でログの表示が停止するということに注意してください" #. (para) #: ../source/TortoiseGit_en.xml:5894 @@ -5189,8 +5189,8 @@ msgstr "マージ追跡ログ" #. (para) #: ../source/TortoiseGit_en.xml:5990 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." -msgstr "Subversion 1.5 以降では、属性を利用してマージ情報を保持しています。これにより、マージでの変更点の詳細な履歴を得られます。例えば、ブランチで新機能を開発し、ブランチをトランクにマージした場合、たとえブランチでの開発で 1000 コミットしたとしても、トランクでのその機能の開発には、1 コミットしかしていないことになってしまいます。" +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgstr "Git 1.5 以降では、属性を利用してマージ情報を保持しています。これにより、マージでの変更点の詳細な履歴を得られます。例えば、ブランチで新機能を開発し、ブランチをトランクにマージした場合、たとえブランチでの開発で 1000 コミットしたとしても、トランクでのその機能の開発には、1 コミットしかしていないことになってしまいます。" #. (title) #: ../source/TortoiseGit_en.xml:5999 @@ -5224,8 +5224,8 @@ msgstr "時には、一度入力したログメッセージを変更したいこ #. (para) #: ../source/TortoiseGit_en.xml:6031 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." -msgstr "Subversion では、リビジョンのログメッセージや作者をいつでも変更できます。しかしその変更を元に戻せない (この変更はバージョン管理外になります) ので、デフォルトではこの機能は無効になっています。これを有効にするには、pre-revprop-change フックをセットアップする必要があります。この手順の詳細については、Subversion Bookの Hook Scripts をご覧ください。(訳注 日本語では フックスクリプトをご覧ください) Windows マシンでのフックの実装については、 をご覧ください。" +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgstr "Git では、リビジョンのログメッセージや作者をいつでも変更できます。しかしその変更を元に戻せない (この変更はバージョン管理外になります) ので、デフォルトではこの機能は無効になっています。これを有効にするには、pre-revprop-change フックをセットアップする必要があります。この手順の詳細については、Git Bookの Hook Scripts をご覧ください。(訳注 日本語では フックスクリプトをご覧ください) Windows マシンでのフックの実装については、 をご覧ください。" #. (para) #: ../source/TortoiseGit_en.xml:6044 @@ -5234,8 +5234,8 @@ msgstr "一度、必要なフックをサーバにセットアップしてしま #. (para) #: ../source/TortoiseGit_en.xml:6051 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." -msgstr "Subversion のリビジョン属性はバージョン管理されないため、そういった属性 (例: svn:log コミットメッセージ属性) を変更すると、以前の値を 完全に 上書きしてしまいます。" +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgstr "Git のリビジョン属性はバージョン管理されないため、そういった属性 (例: svn:log コミットメッセージ属性) を変更すると、以前の値を 完全に 上書きしてしまいます。" #. (title) #: ../source/TortoiseGit_en.xml:6061 @@ -5284,8 +5284,8 @@ msgstr "リポジトリブラウザからログのフォーマット変更はで #. (para) #: ../source/TortoiseGit_en.xml:6119 -msgid "Because the formatting depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." -msgstr "ログのフォーマット変更は、subversion の属性にアクセスできることに依存しているため、チェックアウトした作業コピーを使用するときにだけ、結果を目にするでしょう。リモートから属性を取得するのは遅い操作ですので、作動中のこの機能をリポジトリブラウザから目にすることはないでしょう。" +msgid "Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgstr "ログのフォーマット変更は、Git の属性にアクセスできることに依存しているため、チェックアウトした作業コピーを使用するときにだけ、結果を目にするでしょう。リモートから属性を取得するのは遅い操作ですので、作動中のこの機能をリポジトリブラウザから目にすることはないでしょう。" #. (title) #: ../source/TortoiseGit_en.xml:6129 @@ -5503,8 +5503,8 @@ msgstr "作業コピーのファイル・フォルダと URL 間の差分" #. (para) #: ../source/TortoiseGit_en.xml:6382 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." -msgstr "作業コピーの 2 つの異なるファイルや、Subversion リポジトリにあるファイルの差分を確認する場合、エクスプローラで直接両方選択してください。その後、Shift キーを押しながら右クリックし、コンテキストメニューを表示してください。TortoiseGitURL と差分 を選択してください。作業コピーのフォルダについても同じことです。TortoiseMerge はパッチファイルと同様に (それぞれを見られる、変更のあったファイルの一覧として) 差分を表示します。" +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgstr "作業コピーの 2 つの異なるファイルや、Git リポジトリにあるファイルの差分を確認する場合、エクスプローラで直接両方選択してください。その後、Shift キーを押しながら右クリックし、コンテキストメニューを表示してください。TortoiseGitURL と差分 を選択してください。作業コピーのフォルダについても同じことです。TortoiseMerge はパッチファイルと同様に (それぞれを見られる、変更のあったファイルの一覧として) 差分を表示します。" #. (term) #: ../source/TortoiseGit_en.xml:6400 @@ -5898,8 +5898,8 @@ msgstr "タグ" #. (para) #: ../source/TortoiseGit_en.xml:6826 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." -msgstr "既存ファイルを、リポジトリ内の別プロジェクトに持っていかねばならないことがしばしばあり、単純にコピーしたくなると思います。既に述べたように、単純にコピーした上で、そのファイルを追加することもできますが、それまでの履歴を失ってしまいます。また、後でオリジナルファイルにバグ修正を行った場合、Subversion 内で新しいコピーがオリジナルと関連付いている場合に限り、自動的に修正をマージできます。" +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." +msgstr "既存ファイルを、リポジトリ内の別プロジェクトに持っていかねばならないことがしばしばあり、単純にコピーしたくなると思います。既に述べたように、単純にコピーした上で、そのファイルを追加することもできますが、それまでの履歴を失ってしまいます。また、後でオリジナルファイルにバグ修正を行った場合、Git 内で新しいコピーがオリジナルと関連付いている場合に限り、自動的に修正をマージできます。" #. (para) #: ../source/TortoiseGit_en.xml:6834 @@ -5983,8 +5983,8 @@ msgstr "共通無視リスト" #. (para) #: ../source/TortoiseGit_en.xml:6958 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." -msgstr "ファイルを無視する別の方法は、共通無視リスト に追加することです。共通無視リストはクライアントの属性ということが、大きく違います。これは 全 Subversion プロジェクトに適用されますが、クライアント PC でしか適用されません。一般的には、可能なら svn:ignore 属性を使用する方がよいです。指定したプロジェクトエリアで適用され、プロジェクトをチェックアウトした人すべてに適用されるからです。詳細は をご覧ください。" +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgstr "ファイルを無視する別の方法は、共通無視リスト に追加することです。共通無視リストはクライアントの属性ということが、大きく違います。これは 全 Git プロジェクトに適用されますが、クライアント PC でしか適用されません。一般的には、可能なら svn:ignore 属性を使用する方がよいです。指定したプロジェクトエリアで適用され、プロジェクトをチェックアウトした人すべてに適用されるからです。詳細は をご覧ください。" #. (title) #: ../source/TortoiseGit_en.xml:6971 @@ -5993,8 +5993,8 @@ msgstr "バージョン管理下項目の無視" #. (para) #: ../source/TortoiseGit_en.xml:6972 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." -msgstr "バージョン管理下のファイルやフォルダは無視できません。これは Subversion の機能です。間違えてバージョン管理下に入れてしまった場合は、 にある、バージョン管理外にする方法をご覧ください。" +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." +msgstr "バージョン管理下のファイルやフォルダは無視できません。これは Git の機能です。間違えてバージョン管理下に入れてしまった場合は、 にある、バージョン管理外にする方法をご覧ください。" #. (title) #: ../source/TortoiseGit_en.xml:6980 @@ -6043,8 +6043,8 @@ msgstr "角かっこで囲まれた一文字にマッチします。かっこ内 #. (para) #: ../source/TortoiseGit_en.xml:6987 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " -msgstr "Subversion の無視パターンは、ファイル名展開を使用できます。これは本来 Unix でファイルを指定するのにメタキャラクタをワイルドカードとして使用するテクニックです。以下の文字が特別な意味を持ちます。" +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgstr "Git の無視パターンは、ファイル名展開を使用できます。これは本来 Unix でファイルを指定するのにメタキャラクタをワイルドカードとして使用するテクニックです。以下の文字が特別な意味を持ちます。" #. (para) #: ../source/TortoiseGit_en.xml:7027 @@ -6078,8 +6078,8 @@ msgstr "バージョン管理下のファイルに対するエクスプローラ #. (para) #: ../source/TortoiseGit_en.xml:7062 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " -msgstr "CVS と違い、Subversion はファイル・フォルダの名前の変更や移動ができます。そのため TortoiseGit のサブメニューには、削除や名前の変更のメニューエントリがあります。" +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgstr "CVS と違い、Git はファイル・フォルダの名前の変更や移動ができます。そのため TortoiseGit のサブメニューには、削除や名前の変更のメニューエントリがあります。" #. (title) #: ../source/TortoiseGit_en.xml:7072 @@ -6098,8 +6098,8 @@ msgstr "削除" #. (para) #: ../source/TortoiseGit_en.xml:7079 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." -msgstr "subversionから、ファイルやフォルダを削除するには、TortoiseGit削除 としてください。" +msgid "Use TortoiseGitDelete to remove files or folders from Git." +msgstr "Gitから、ファイルやフォルダを削除するには、TortoiseGit削除 としてください。" #. (para) #: ../source/TortoiseGit_en.xml:7087 @@ -6108,8 +6108,8 @@ msgstr "ファイルを TortoiseGit #. (para) #: ../source/TortoiseGit_en.xml:7103 -msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." -msgstr "フォルダを TortoiseGit削除 すると、作業コピーには残りますが、オーバーレイアイコンが変わり削除のマークが付きます。変更をコミットする前なら、そのフォルダで TortoiseGit元に戻す で元に戻せます。この違いは、Subversion の部分によるもので、TortoiseGit によるものではありません。" +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." +msgstr "フォルダを TortoiseGit削除 すると、作業コピーには残りますが、オーバーレイアイコンが変わり削除のマークが付きます。変更をコミットする前なら、そのフォルダで TortoiseGit元に戻す で元に戻せます。この違いは、Git の部分によるもので、TortoiseGit によるものではありません。" #. (para) #: ../source/TortoiseGit_en.xml:7120 @@ -6118,13 +6118,13 @@ msgstr "リポジトリから削除したい、でもバージョン管理外の #. (para) #: ../source/TortoiseGit_en.xml:7131 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." -msgstr "TortoiseGit コンテキストメニューを使用しないで、ファイルをエクスプローラで削除した場合、コミットダイアログにそのファイルを表示し、コミットの前にバージョン管理から削除するかどうか確認することになります。しかし、作業コピーを更新する場合、Subversion は紛失ファイルを特定し、リポジトリから最新のファイルを取得して置き換えます。バージョン管理下のファイルを削除する必要がある場合は、常に TortoiseGit削除 を使用するようにしてください。そうすると Subversion がファイルを本当に削除したいのかどうか推測する必要がなくなります。" +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." +msgstr "TortoiseGit コンテキストメニューを使用しないで、ファイルをエクスプローラで削除した場合、コミットダイアログにそのファイルを表示し、コミットの前にバージョン管理から削除するかどうか確認することになります。しかし、作業コピーを更新する場合、Git は紛失ファイルを特定し、リポジトリから最新のファイルを取得して置き換えます。バージョン管理下のファイルを削除する必要がある場合は、常に TortoiseGit削除 を使用するようにしてください。そうすると Git がファイルを本当に削除したいのかどうか推測する必要がなくなります。" #. (para) #: ../source/TortoiseGit_en.xml:7145 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." -msgstr "TortoiseGit コンテキストメニューを使用しないで、フォルダをエクスプローラで削除した場合、作業コピーを破損してしまいコミットできなくなります。作業コピーを更新すると、Subversion はリポジトリから最新のフォルダを取得し、紛失したフォルダと置き換えます。そのため、フォルダを削除する正しい方法は、TortoiseGit削除 を使用することです。" +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgstr "TortoiseGit コンテキストメニューを使用しないで、フォルダをエクスプローラで削除した場合、作業コピーを破損してしまいコミットできなくなります。作業コピーを更新すると、Git はリポジトリから最新のフォルダを取得し、紛失したフォルダと置き換えます。そのため、フォルダを削除する正しい方法は、TortoiseGit削除 を使用することです。" #. (title) #: ../source/TortoiseGit_en.xml:7158 @@ -6217,13 +6217,13 @@ msgstr "大/小文字の変更" #. (para) #: ../source/TortoiseGit_en.xml:7274 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." -msgstr "Windows 上の Subversion で、ファイル名を文字の大小のみの変更はやりにくいです。変更中の短時間でも、両方のファイル名が同時に存在してしまうためです。Windows は、文字の大小を区別しないファイルシステムを使用しており、通常の「名前の変更」コマンドは使用できません。" +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgstr "Windows 上の Git で、ファイル名を文字の大小のみの変更はやりにくいです。変更中の短時間でも、両方のファイル名が同時に存在してしまうためです。Windows は、文字の大小を区別しないファイルシステムを使用しており、通常の「名前の変更」コマンドは使用できません。" #. (para) #: ../source/TortoiseGit_en.xml:7280 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" -msgstr "幸い、ログの履歴を失わずにファイルの名前を変更する、(少なくとも) 2 つの有効な解決法があります。重要なのは Subversion で名前を変更することです。単にエクスプローラで名前を変更すると、作業コピーが壊れてしまいます!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" +msgstr "幸い、ログの履歴を失わずにファイルの名前を変更する、(少なくとも) 2 つの有効な解決法があります。重要なのは Git で名前を変更することです。単にエクスプローラで名前を変更すると、作業コピーが壊れてしまいます!" #. (para) #: ../source/TortoiseGit_en.xml:7290 @@ -6274,8 +6274,8 @@ msgstr "ファイル名の大文字小文字が競合した場合の対処" #. (para) #: ../source/TortoiseGit_en.xml:7336 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." -msgstr "リポジトリ内に、文字の大小のみが異なる同じ名前のファイル (例: TEST.TXT と test.txt) がある場合、Windows のクライアントで、親ディレクトリの更新・チェックアウトができなくなります。Subversion は文字の大小を区別していますが、Windows はそうではないからです。" +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." +msgstr "リポジトリ内に、文字の大小のみが異なる同じ名前のファイル (例: TEST.TXT と test.txt) がある場合、Windows のクライアントで、親ディレクトリの更新・チェックアウトができなくなります。Git は文字の大小を区別していますが、Windows はそうではないからです。" #. (para) #: ../source/TortoiseGit_en.xml:7344 @@ -6304,13 +6304,13 @@ msgstr "ファイルの名前変更の修復" #. (para) #: ../source/TortoiseGit_en.xml:7368 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." -msgstr "時に、親切な IDE がリファクタリングの一環でファイルの名前変更を行います。そしてもちろん Subversion に通知しません。変更をコミットすると、Subversion には古いファイル名を紛失ファイル、新しいファイル名をバージョン管理外のファイルとして見えることになります。新しいファイルを追加することもできますが、Subversion にはそのファイルの関連が分かりませんから、追跡履歴を失うことになります。" +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." +msgstr "時に、親切な IDE がリファクタリングの一環でファイルの名前変更を行います。そしてもちろん Git に通知しません。変更をコミットすると、Git には古いファイル名を紛失ファイル、新しいファイル名をバージョン管理外のファイルとして見えることになります。新しいファイルを追加することもできますが、Git にはそのファイルの関連が分かりませんから、追跡履歴を失うことになります。" #. (para) #: ../source/TortoiseGit_en.xml:7376 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "もっと良い方法は、Subversion に実際には名前変更であったと通知することです。これはコミット ダイアログと 変更をチェック ダイアログで行えます。単に古い名前 (紛失) と新しい名前 (バージョン管理外) を選択し、コンテキストメニュー移動を修復 を使用して、2 つのファイルが名前の変更であったと通知します。" +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "もっと良い方法は、Git に実際には名前変更であったと通知することです。これはコミット ダイアログと 変更をチェック ダイアログで行えます。単に古い名前 (紛失) と新しい名前 (バージョン管理外) を選択し、コンテキストメニュー移動を修復 を使用して、2 つのファイルが名前の変更であったと通知します。" #. (title) #: ../source/TortoiseGit_en.xml:7390 @@ -6319,8 +6319,8 @@ msgstr "バージョン管理外フォルダの削除" #. (para) #: ../source/TortoiseGit_en.xml:7391 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." -msgstr "通常、生成した全ファイルといった無視リストは、Subversion が無視します。しかし、もしクリーンビルドを提供するため、無視されるファイルをすべてクリアするとしたらどうでしょうか? 通常、makefile を設定しているでしょうが、makefile のデバッグやビルドシステムを変更する際に、デッキをクリアする方法があると便利です。" +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgstr "通常、生成した全ファイルといった無視リストは、Git が無視します。しかし、もしクリーンビルドを提供するため、無視されるファイルをすべてクリアするとしたらどうでしょうか? 通常、makefile を設定しているでしょうが、makefile のデバッグやビルドシステムを変更する際に、デッキをクリアする方法があると便利です。" #. (para) #: ../source/TortoiseGit_en.xml:7398 @@ -6414,13 +6414,13 @@ msgstr "クリーンアップ" #. (para) #: ../source/TortoiseGit_en.xml:7493 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." -msgstr "サーバの問題等で、Subversion コマンドが正常に終了しなかった場合、作業コピーが矛盾した状態のままになってしまうことがあります。この場合、TortoiseGitクリーンアップ をフォルダに対して行う必要があります。作業コピーの最上層で行うのがいいでしょう。" +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgstr "サーバの問題等で、Git コマンドが正常に終了しなかった場合、作業コピーが矛盾した状態のままになってしまうことがあります。この場合、TortoiseGitクリーンアップ をフォルダに対して行う必要があります。作業コピーの最上層で行うのがいいでしょう。" #. (para) #: ../source/TortoiseGit_en.xml:7504 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." -msgstr "クリーンアップには他の便利な側面もあります。ファイルの日付に変更があっても内容に変更がない場合、元のコピーとバイトごとの比較を行わない限り、Subversion は本当に変更があったかどうかわかりません。この状態になったファイルがたくさんあると、状態を取得するのが (ダイアログがたくさん表示されて) 遅くなります。作業コピーでクリーンアップを行うと、壊れたタイムスタンプを修正し、状態チェックが早く終わるように戻ります。" +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgstr "クリーンアップには他の便利な側面もあります。ファイルの日付に変更があっても内容に変更がない場合、元のコピーとバイトごとの比較を行わない限り、Git は本当に変更があったかどうかわかりません。この状態になったファイルがたくさんあると、状態を取得するのが (ダイアログがたくさん表示されて) 遅くなります。作業コピーでクリーンアップを行うと、壊れたタイムスタンプを修正し、状態チェックが早く終わるように戻ります。" #. (title) #: ../source/TortoiseGit_en.xml:7515 @@ -6429,8 +6429,8 @@ msgstr "コミットタイムスタンプの使用" #. (para) #: ../source/TortoiseGit_en.xml:7516 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." -msgstr "いくつかの Subversion の以前のリリースでは、コミット時刻の使用 オプションをチェックしてのチェックアウト時に、タイムスタンプが一致しないというバグがありました。そういった作業コピーをスピードアップするのに、クリーンアップコマンドを使用してください。" +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgstr "いくつかの Git の以前のリリースでは、コミット時刻の使用 オプションをチェックしてのチェックアウト時に、タイムスタンプが一致しないというバグがありました。そういった作業コピーをスピードアップするのに、クリーンアップコマンドを使用してください。" #. (title) #: ../source/TortoiseGit_en.xml:7526 @@ -6444,38 +6444,38 @@ msgstr "属性" #. (title) #: ../source/TortoiseGit_en.xml:7532 -msgid "Explorer property page, Subversion tab" -msgstr "エクスプローラプロパティページの Subversion タブ" +msgid "Explorer property page, Git tab" +msgstr "エクスプローラプロパティページの Git タブ" #. (para) #: ../source/TortoiseGit_en.xml:7530 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." -msgstr " 時にオーバーレイアイコンより詳しい、ファイル・ディレクトリに関する情報が欲しいことがあるでしょう。そういったとき Subversion が提供するすべての情報をエクスプローラのプロパティダイアログから取得することができます。単にファイルやディレクトリを選択し、コンテキストメニューの Windows メニュープロパティ を選択してください。(注: エクスプローラが提供する通常のプロパティメニューで、TortoiseGit のサブメニュー内のものではありません!) Subversion 管理下にあるファイル・フォルダの属性ダイアログボックスには、TortoiseGit が追加した新しい属性ページがあります。ここで、選択したファイル・フォルダに関連する情報を、すべて見ることができます。" +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." +msgstr " 時にオーバーレイアイコンより詳しい、ファイル・ディレクトリに関する情報が欲しいことがあるでしょう。そういったとき Git が提供するすべての情報をエクスプローラのプロパティダイアログから取得することができます。単にファイルやディレクトリを選択し、コンテキストメニューの Windows メニュープロパティ を選択してください。(注: エクスプローラが提供する通常のプロパティメニューで、TortoiseGit のサブメニュー内のものではありません!) Git 管理下にあるファイル・フォルダの属性ダイアログボックスには、TortoiseGit が追加した新しい属性ページがあります。ここで、選択したファイル・フォルダに関連する情報を、すべて見ることができます。" #. (title) #: ../source/TortoiseGit_en.xml:7552 -msgid "Subversion Properties" -msgstr "Subversion の属性" +msgid "Git Properties" +msgstr "Git の属性" #. (primary) #: ../source/TortoiseGit_en.xml:7554 -msgid "Subversion properties" -msgstr "Subversion 属性" +msgid "Git properties" +msgstr "Git 属性" #. (title) #: ../source/TortoiseGit_en.xml:7560 -msgid "Subversion property page" -msgstr "Subversion の属性ページ" +msgid "Git property page" +msgstr "Git の属性ページ" #. (para) #: ../source/TortoiseGit_en.xml:7558 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." -msgstr " Windows のプロパティダイアログから、Subversion の属性を確認・設定できますが、さらに TortoiseGit属性 や コンテキストメニュー属性 からの TortoiseGit の状態リストでも確認できます。" +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgstr " Windows のプロパティダイアログから、Git の属性を確認・設定できますが、さらに TortoiseGit属性 や コンテキストメニュー属性 からの TortoiseGit の状態リストでも確認できます。" #. (para) #: ../source/TortoiseGit_en.xml:7575 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." -msgstr "自分で定義した属性の他、Subversion で特別な意味のある属性も追加できます。これは svn: で始まります。svn:externals も、そのような属性です。 で外部参照の説明をしていますのでご覧ください。" +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgstr "自分で定義した属性の他、Git で特別な意味のある属性も追加できます。これは svn: で始まります。svn:externals も、そのような属性です。 で外部参照の説明をしていますのでご覧ください。" #. (title) #: ../source/TortoiseGit_en.xml:7582 @@ -6519,18 +6519,18 @@ msgstr "前述の 4 つのキーワードの組み合わせたもの。" #. (para) #: ../source/TortoiseGit_en.xml:7589 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " -msgstr "Subversion は、ファイル自身にファイル名やリビジョン情報を埋め込む CVS 風キーワード展開をサポートしています。現在キーワードは以下のものをサポートしています。" +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgstr "Git は、ファイル自身にファイル名やリビジョン情報を埋め込む CVS 風キーワード展開をサポートしています。現在キーワードは以下のものをサポートしています。" #. (para) #: ../source/TortoiseGit_en.xml:7640 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." -msgstr "以上のキーワードの使用法については、Subversion book の svn:keywords section で、キーワードの説明とその有効化・利用法の説明をしています。" +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." +msgstr "以上のキーワードの使用法については、Git book の svn:keywords section で、キーワードの説明とその有効化・利用法の説明をしています。" #. (para) #: ../source/TortoiseGit_en.xml:7650 -msgid "For more information about properties in Subversion see the Special Properties." -msgstr "Subversion の属性に関する詳細情報は、Special Properties をご覧ください。" +msgid "For more information about properties in Git see the Special Properties." +msgstr "Git の属性に関する詳細情報は、Special Properties をご覧ください。" #. (title) #: ../source/TortoiseGit_en.xml:7657 @@ -6634,13 +6634,13 @@ msgstr "auto-props" #. (para) #: ../source/TortoiseGit_en.xml:7768 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." -msgstr "ファイルやフォルダをリポジトリに追加した際に、自動的に属性を設定するように Subversion や TortoiseGit を設定できます。これには 2 通りの方法があります。" +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgstr "ファイルやフォルダをリポジトリに追加した際に、自動的に属性を設定するように Git や TortoiseGit を設定できます。これには 2 通りの方法があります。" #. (para) #: ../source/TortoiseGit_en.xml:7773 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." -msgstr "subversion 設定ファイルを編集して、あなたのクライアントでこの機能を有効にできます。TortoiseGit の設定ダイアログの 一般 ページに、直接編集を行える編集ボタンがあります。設定ファイルは、subversion の動作を制御する、シンプルなテキストファイルです。ここで 2 つの変更をする必要があります。ひとつめは、miscellany という見出しのセクションで、enable-auto-props = yes という行をアンコメントします。ふたつめは、その下にある、どのファイルタイプに、どの属性を追加するかを定義したセクションを、編集する必要があります。この方法は、一般的な subversion の機能で、どの subversion クライアントでも動作します。しかし、各クライアントでそれぞれ定義しなければなりません。つまり、この設定をリポジトリに伝播する方法はありません。" +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgstr "Git 設定ファイルを編集して、あなたのクライアントでこの機能を有効にできます。TortoiseGit の設定ダイアログの 一般 ページに、直接編集を行える編集ボタンがあります。設定ファイルは、Git の動作を制御する、シンプルなテキストファイルです。ここで 2 つの変更をする必要があります。ひとつめは、miscellany という見出しのセクションで、enable-auto-props = yes という行をアンコメントします。ふたつめは、その下にある、どのファイルタイプに、どの属性を追加するかを定義したセクションを、編集する必要があります。この方法は、一般的な Git の機能で、どの Git クライアントでも動作します。しかし、各クライアントでそれぞれ定義しなければなりません。つまり、この設定をリポジトリに伝播する方法はありません。" #. (para) #: ../source/TortoiseGit_en.xml:7790 @@ -6664,8 +6664,8 @@ msgstr "属性のコミット" #. (para) #: ../source/TortoiseGit_en.xml:7810 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." -msgstr "Subversion の属性はバージョン管理されます。属性を変更したり追加した後には、変更をコミットする必要があります。" +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." +msgstr "Git の属性はバージョン管理されます。属性を変更したり追加した後には、変更をコミットする必要があります。" #. (title) #: ../source/TortoiseGit_en.xml:7816 @@ -6674,8 +6674,8 @@ msgstr "属性の競合" #. (para) #: ../source/TortoiseGit_en.xml:7817 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." -msgstr "他のユーザが同じ属性を変更したなどして、コミット時に競合が発生した場合、Subversion は .prej ファイルを生成します。競合を解消した後にこのファイルを削除してください。" +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." +msgstr "他のユーザが同じ属性を変更したなどして、コミット時に競合が発生した場合、Git は .prej ファイルを生成します。競合を解消した後にこのファイルを削除してください。" #. (title) #: ../source/TortoiseGit_en.xml:7826 @@ -6714,8 +6714,8 @@ msgstr "tsvn:logtemplate はログメッセージを整形す #. (para) #: ../source/TortoiseGit_en.xml:7882 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." -msgstr "新しくファイルの追加やインポートした際に、拡張子を元に属性を付加するように、Subversion は autoprops を設定できます。これはクライアントごとに、Subversion 設定ファイルに適切に autoprops が設定されているかどうかに依存します。tsvn:autoprops をフォルダに設定しておくと、インポートやファイル追加の際に、ユーザのローカルに autoprops をマージするようになります。この形式は subversion の autoprops と同じで、.sh 拡張子を持つファイルに 2 つの属性を セットしたい場合は、*.sh = svn:eol-style=native;svn:executable のようになります。" +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgstr "新しくファイルの追加やインポートした際に、拡張子を元に属性を付加するように、Git は autoprops を設定できます。これはクライアントごとに、Git 設定ファイルに適切に autoprops が設定されているかどうかに依存します。tsvn:autoprops をフォルダに設定しておくと、インポートやファイル追加の際に、ユーザのローカルに autoprops をマージするようになります。この形式は Git の autoprops と同じで、.sh 拡張子を持つファイルに 2 つの属性を セットしたい場合は、*.sh = svn:eol-style=native;svn:executable のようになります。" #. (para) #: ../source/TortoiseGit_en.xml:7895 @@ -6801,8 +6801,8 @@ msgstr "TortoiseGit で新しいサブフォルダを作成する際、親フォ #. (para) #: ../source/TortoiseGit_en.xml:8015 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." -msgstr "TortoiseGit のプロジェクト属性は非常に便利ですが、TortoiseGit でしか動作せず、またいくつかは TortoiseGit の新しいバージョンでしか動作しません。プロジェクトのメンバが様々な Subversion のクライアントを使用している場合や、古い TortoiseGit しか持てない場合、プロジェクトポリシーを強制するのに、リポジトリフックを使用することになるでしょう。プロジェクト属性は、ポリシー実装の補助にしかならず、強制することはできません。" +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgstr "TortoiseGit のプロジェクト属性は非常に便利ですが、TortoiseGit でしか動作せず、またいくつかは TortoiseGit の新しいバージョンでしか動作しません。プロジェクトのメンバが様々な Git のクライアントを使用している場合や、古い TortoiseGit しか持てない場合、プロジェクトポリシーを強制するのに、リポジトリフックを使用することになるでしょう。プロジェクト属性は、ポリシー実装の補助にしかならず、強制することはできません。" #. (title) #: ../source/TortoiseGit_en.xml:8028 @@ -6833,8 +6833,8 @@ msgstr "バージョン管理システムのもう一つの特徴は、特定の #. (para) #: ../source/TortoiseGit_en.xml:8058 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." -msgstr "Subversion には、ブランチ付けやタグ付け用の特別なコマンドはありませんが、代わりに 簡易コピー と呼ばれるものを使用できます。チープコピーは、Unix のハードリンクと似ています。つまりリポジトリの完全なコピーを作成する代わりに、指定したツリーやリビジョンを指す内部リンクを作成します。そのため、ブランチやタグの作成は、非常に高速で、リポジトリに余分なスペースをほとんど使用しません。" +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgstr "Git には、ブランチ付けやタグ付け用の特別なコマンドはありませんが、代わりに 簡易コピー と呼ばれるものを使用できます。チープコピーは、Unix のハードリンクと似ています。つまりリポジトリの完全なコピーを作成する代わりに、指定したツリーやリビジョンを指す内部リンクを作成します。そのため、ブランチやタグの作成は、非常に高速で、リポジトリに余分なスペースをほとんど使用しません。" #. (title) #: ../source/TortoiseGit_en.xml:8068 @@ -6980,8 +6980,8 @@ msgstr "ブランチから作成した作業コピーを変更し、コミット #. (para) #: ../source/TortoiseGit_en.xml:8245 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " -msgstr "Subversion 自身はタグとブランチを区別しませんが、通常以下のように多少使い分けをします。" +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgstr "Git 自身はタグとブランチを区別しませんが、通常以下のように多少使い分けをします。" #. (title) #: ../source/TortoiseGit_en.xml:8289 @@ -7006,8 +7006,8 @@ msgstr "ブランチを開発の独立したラインでメンテナンスする #. (para) #: ../source/TortoiseGit_en.xml:8299 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." -msgstr "Subversion 内でどのように分岐やマージを行っているかを、はじめる前に理解しておくのは (かなり複雑になってしまうため) 重要です。Subversion book の Branching and Merging の章を読むのを強くお勧めします。ここには詳しい説明とたくさんの使用例があります。" +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." +msgstr "Git 内でどのように分岐やマージを行っているかを、はじめる前に理解しておくのは (かなり複雑になってしまうため) 重要です。Git book の Branching and Merging の章を読むのを強くお勧めします。ここには詳しい説明とたくさんの使用例があります。" #. (para) #: ../source/TortoiseGit_en.xml:8309 @@ -7036,8 +7036,8 @@ msgstr "ひとつ以上のリビジョンをブランチに (またはトラン #. (para) #: ../source/TortoiseGit_en.xml:8342 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." -msgstr "Subversion に以下のことを行うように指示を出しています。ブランチ A のリビジョン 1 [FROM] から、ブランチ A のリビジョン 7 [TO] までの必要な変更点を計算し、(トランクやブランチ B の) 作業コピーに変更点を適用する" +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgstr "Git に以下のことを行うように指示を出しています。ブランチ A のリビジョン 1 [FROM] から、ブランチ A のリビジョン 7 [TO] までの必要な変更点を計算し、(トランクやブランチ B の) 作業コピーに変更点を適用する" #. (term) #. (title) @@ -7048,13 +7048,13 @@ msgstr "ブランチの再統合" #. (para) #: ../source/TortoiseGit_en.xml:8353 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." -msgstr "この方法は、Subversion book で述べられている機能ブランチを作成する際についてを扱います。トランクのすべての変更を、週ごとに機能ブランチに移し、機能が完全になったらトランクにマージします。機能ブランチをトランクと同期させておくため、ブランチの最新バージョンとトランクは、ブランチへの変更を除いて、完全に一致するはずです。" +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgstr "この方法は、Git book で述べられている機能ブランチを作成する際についてを扱います。トランクのすべての変更を、週ごとに機能ブランチに移し、機能が完全になったらトランクにマージします。機能ブランチをトランクと同期させておくため、ブランチの最新バージョンとトランクは、ブランチへの変更を除いて、完全に一致するはずです。" #. (para) #: ../source/TortoiseGit_en.xml:8362 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." -msgstr "これは以下に述べるツリーのマージの特殊なケースで、(通常) 開発ブランチからマージする URL のみが必要です。これは使用する正しいリビジョン範囲を計算するのに、Subversion のマージ追跡機能を使用し、トランクの変更でブランチを完全に更新できたかを確認するのに、追加チェックを利用します。これはあなたが最後に同期を取ってから、他の誰かがトランクにコミットした作業を、偶然元に戻していないことを確認します。" +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgstr "これは以下に述べるツリーのマージの特殊なケースで、(通常) 開発ブランチからマージする URL のみが必要です。これは使用する正しいリビジョン範囲を計算するのに、Git のマージ追跡機能を使用し、トランクの変更でブランチを完全に更新できたかを確認するのに、追加チェックを利用します。これはあなたが最後に同期を取ってから、他の誰かがトランクにコミットした作業を、偶然元に戻していないことを確認します。" #. (para) #: ../source/TortoiseGit_en.xml:8372 @@ -7073,13 +7073,13 @@ msgstr "異なる 2 つのツリーをマージ" #. (para) #: ../source/TortoiseGit_en.xml:8392 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." -msgstr "これは、再統合する方法のもっと一般的なケースで、Subversion に次のことを行うように指示を出しています。トランクの最新リビジョン [FROM] から ブランチの最新リビジョン [TO] までの必要な変更点を計算し、(トランクの) 作業コピーに変更点を適用します 最終結果はトランクがまさしくブランチと同様になっているということになります。" +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgstr "これは、再統合する方法のもっと一般的なケースで、Git に次のことを行うように指示を出しています。トランクの最新リビジョン [FROM] から ブランチの最新リビジョン [TO] までの必要な変更点を計算し、(トランクの) 作業コピーに変更点を適用します 最終結果はトランクがまさしくブランチと同様になっているということになります。" #. (para) #: ../source/TortoiseGit_en.xml:8400 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." -msgstr "サーバ・リポジトリが、マージ追跡をサポートしていない場合、これはブランチをトランクにマージする唯一の方法になります。別のケースとしては、ベンダブランチを使用していて、新しくベンダから落としたコードの変更を、トランクにマージする必要がある場合もありえます。詳細は、Subversion Book の vendor branches をご覧ください。" +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." +msgstr "サーバ・リポジトリが、マージ追跡をサポートしていない場合、これはブランチをトランクにマージする唯一の方法になります。別のケースとしては、ベンダブランチを使用していて、新しくベンダから落としたコードの変更を、トランクにマージする必要がある場合もありえます。詳細は、Git Book の vendor branches をご覧ください。" #. (title) #: ../source/TortoiseGit_en.xml:8415 @@ -7123,8 +7123,8 @@ msgstr "TortoiseGit では、フェンスの板 を使用して #. (para) #: ../source/TortoiseGit_en.xml:8463 -msgid "If you are merging revisions in chunks, the method shown in the subversion book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." -msgstr "かたまりとしてリビジョンをマージしていると、subversion book にある方法では、今回 100-200 をマージし、次回に 200-300 をマージすることになります。TortoiseGit では、今回 100-200 をマージし、次回に 201-300 をマージします。" +msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." +msgstr "かたまりとしてリビジョンをマージしていると、Git book にある方法では、今回 100-200 をマージし、次回に 200-300 をマージすることになります。TortoiseGit では、今回 100-200 をマージし、次回に 201-300 をマージします。" #. (para) #: ../source/TortoiseGit_en.xml:8470 @@ -7148,8 +7148,8 @@ msgstr "このブランチからの変更をすでにマージしてある場合 #. (para) #: ../source/TortoiseGit_en.xml:8508 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." -msgstr "Subversion のマージ追跡機能を使用する場合、どのリビジョンをすでにマージしたかを覚えておく必要はありません。Subversion が記録しています。リビジョン範囲をからのままにしておくと、まだマージしていないリビジョンすべてが対象になります。詳細は をご覧ください。" +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgstr "Git のマージ追跡機能を使用する場合、どのリビジョンをすでにマージしたかを覚えておく必要はありません。Git が記録しています。リビジョン範囲をからのままにしておくと、まだマージしていないリビジョンすべてが対象になります。詳細は をご覧ください。" #. (para) #: ../source/TortoiseGit_en.xml:8516 @@ -7243,8 +7243,8 @@ msgstr "また、マージする深度も指定できます。これは、作業 #. (para) #: ../source/TortoiseGit_en.xml:8618 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" -msgstr "大抵、共通の系統が関係する変更点をマージするように、ファイルの履歴を考慮に入れたいと思うでしょう。時には、おそらく関係する (しかしリポジトリにない) ファイルのマージが必要となります。例えば、サードパーティ製ライブラリのバージョン 1 とバージョン 2 を、それぞれ別のディレクトリにインポートしたとします。これは論理的には関係ありますが、Subversion は tarball をインポートしたとしか見えないので、関係があるとはわかりません。この 2 つのツリーの違いをマージしようとするなら、完全に追加してから完全に除去することになります。Subversion が履歴ベース差分ではなくパスベース差分を使用するようにするには、系統情報の無視 チェックボックスをチェックしてください。このトピックの詳細は、Subversion book の Noticing or Ignoring Ancestry をご覧ください。" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" +msgstr "大抵、共通の系統が関係する変更点をマージするように、ファイルの履歴を考慮に入れたいと思うでしょう。時には、おそらく関係する (しかしリポジトリにない) ファイルのマージが必要となります。例えば、サードパーティ製ライブラリのバージョン 1 とバージョン 2 を、それぞれ別のディレクトリにインポートしたとします。これは論理的には関係ありますが、Git は tarball をインポートしたとしか見えないので、関係があるとはわかりません。この 2 つのツリーの違いをマージしようとするなら、完全に追加してから完全に除去することになります。Git が履歴ベース差分ではなくパスベース差分を使用するようにするには、系統情報の無視 チェックボックスをチェックしてください。このトピックの詳細は、Git book の Noticing or Ignoring Ancestry をご覧ください。" #. (para) #: ../source/TortoiseGit_en.xml:8635 @@ -7278,13 +7278,13 @@ msgstr "さて、マージが完了しました。マージ結果を見て期待 #. (para) #: ../source/TortoiseGit_en.xml:8679 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." -msgstr "バージョン 1.5 未満の Subversion のクライアント・サーバは、マージ情報を格納しておらず、マージしたリビジョンは、手動で追跡しなければなりません。ある変更点のテストを行い、そのリビジョンをコミットする際に、マージで取り込んだリビジョン番号を 常に コミットログに記録するべきです。あとで別のマージを適用しようとしたときに、再度変更を取り込むことがないよう、すでにマージした内容を知る必要があります。これについては Subversion Book の Best Practices for Merging をご覧ください。" +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." +msgstr "バージョン 1.5 未満の Git のクライアント・サーバは、マージ情報を格納しておらず、マージしたリビジョンは、手動で追跡しなければなりません。ある変更点のテストを行い、そのリビジョンをコミットする際に、マージで取り込んだリビジョン番号を 常に コミットログに記録するべきです。あとで別のマージを適用しようとしたときに、再度変更を取り込むことがないよう、すでにマージした内容を知る必要があります。これについては Git Book の Best Practices for Merging をご覧ください。" #. (para) #: ../source/TortoiseGit_en.xml:8696 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." -msgstr "サーバとすべてのクライアントが Subversion 1.5 以上の場合、マージ追跡機構がマージしたリビジョンを記録し、再度マージすることがないようにします。これにより、単純にリビジョン範囲全体を指定し、実際に新しいリビジョンのみがマージされるといったことができるようになります。" +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgstr "サーバとすべてのクライアントが Git 1.5 以上の場合、マージ追跡機構がマージしたリビジョンを記録し、再度マージすることがないようにします。これにより、単純にリビジョン範囲全体を指定し、実際に新しいリビジョンのみがマージされるといったことができるようになります。" #. (para) #: ../source/TortoiseGit_en.xml:8703 @@ -7298,8 +7298,8 @@ msgstr "昨日ブランチからトランクへマージが完了すると、ト #. (para) #: ../source/TortoiseGit_en.xml:8718 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." -msgstr "Subversion ファイルをフォルダとマージはできませんし、逆もまた同様です。ただフォルダとフォルダ、ファイルとファイルで行えます。ファイルをクリックしてマージダイアログを開いたら、ファイルのパスを与えなければなりません。フォルダを選択してダイアログを開いたらマージするフォルダの URL を指定しなければなりません。" +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgstr "Git ファイルをフォルダとマージはできませんし、逆もまた同様です。ただフォルダとフォルダ、ファイルとファイルで行えます。ファイルをクリックしてマージダイアログを開いたら、ファイルのパスを与えなければなりません。フォルダを選択してダイアログを開いたらマージするフォルダの URL を指定しなければなりません。" #. (title) #: ../source/TortoiseGit_en.xml:8728 @@ -7338,8 +7338,8 @@ msgstr "マージされたリビジョンのリストにある、実際にはマ #. (para) #: ../source/TortoiseGit_en.xml:8732 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " -msgstr "Subversion 1.5 は、マージ追跡機構を導入しました。あるツリーから別のツリーへ変更をマージすると、マージしたリビジョン番号を格納し、この情報を様々な異なる用途に利用します。" +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgstr "Git 1.5 は、マージ追跡機構を導入しました。あるツリーから別のツリーへ変更をマージすると、マージしたリビジョン番号を格納し、この情報を様々な異なる用途に利用します。" #. (para) #: ../source/TortoiseGit_en.xml:8774 @@ -7348,8 +7348,8 @@ msgstr "マージを行う際、クライアントはマージ追跡情報を、 #. (para) #: ../source/TortoiseGit_en.xml:8784 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." -msgstr "マージ追跡についての詳細は、Subversion の Merge tracking documentation にあります。" +msgid "Find out more about merge tracking from Git's Merge tracking documentation." +msgstr "マージ追跡についての詳細は、Git の Merge tracking documentation にあります。" #. (title) #: ../source/TortoiseGit_en.xml:8792 @@ -7463,18 +7463,18 @@ msgstr "あなたの会社が過去に、ロックするリビジョン管理シ #. (para) #: ../source/TortoiseGit_en.xml:8918 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " -msgstr "Subversion は一般的に、 で先に説明したとおり、コピー・変更・マージ 法を使用して、ロックしない方が最もよく動作します。しかし、ロックするポリシーの形で実現する必要があるかもしれません。" +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgstr "Git は一般的に、 で先に説明したとおり、コピー・変更・マージ 法を使用して、ロックしない方が最もよく動作します。しかし、ロックするポリシーの形で実現する必要があるかもしれません。" #. (para) #: ../source/TortoiseGit_en.xml:8942 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." -msgstr "第一に Subversion サーバをバージョン 1.2 以降に確実にアップグレードする必要があります。それ以前のバージョンでは、ロックを全くサポートしていません。file:// アクセスを使用するなら、もちろんクライアントの方を更新する必要があります。" +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgstr "第一に Git サーバをバージョン 1.2 以降に確実にアップグレードする必要があります。それ以前のバージョンでは、ロックを全くサポートしていません。file:// アクセスを使用するなら、もちろんクライアントの方を更新する必要があります。" #. (title) #: ../source/TortoiseGit_en.xml:8949 -msgid "How Locking Works in Subversion" -msgstr "Subversion でロックがどのように働くか" +msgid "How Locking Works in Git" +msgstr "Git でロックがどのように働くか" #. (para) #: ../source/TortoiseGit_en.xml:8950 @@ -7488,8 +7488,8 @@ msgstr "ファイルのロックを取得すると、あ #. (para) #: ../source/TortoiseGit_en.xml:8963 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." -msgstr "しかし他のユーザは、あなたがロックしたことを知る必要はありません。定期的にロック状態をチェックしなければ、まず他のユーザはコミットが失敗して気が付くでしょう。ほとんどこのケースでしょうがあまり便利ではありません。ロックの管理を簡単にするには、新しい Subversion の属性で svn:needs-lock があります。ファイルにこの属性が (値は何でも) セットされていると、ファイルをチェックアウトや更新すると常に手元のコピーは読み取り専用になります。ファイルにロックを取得しない限りこのままです。この動作は、まずロックを取得するまでファイルの編集ができないということを警告しています。バージョン管理下で読み取り専用のファイルは、編集前にロックする必要があることを示すように、TortoiseGit では特別なオーバーレイアイコンでマークされます。" +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgstr "しかし他のユーザは、あなたがロックしたことを知る必要はありません。定期的にロック状態をチェックしなければ、まず他のユーザはコミットが失敗して気が付くでしょう。ほとんどこのケースでしょうがあまり便利ではありません。ロックの管理を簡単にするには、新しい Git の属性で svn:needs-lock があります。ファイルにこの属性が (値は何でも) セットされていると、ファイルをチェックアウトや更新すると常に手元のコピーは読み取り専用になります。ファイルにロックを取得しない限りこのままです。この動作は、まずロックを取得するまでファイルの編集ができないということを警告しています。バージョン管理下で読み取り専用のファイルは、編集前にロックする必要があることを示すように、TortoiseGit では特別なオーバーレイアイコンでマークされます。" #. (para) #: ../source/TortoiseGit_en.xml:8979 @@ -7498,8 +7498,8 @@ msgstr "ロックは所有者と共に作業コピーの場所に記録されま #. (para) #: ../source/TortoiseGit_en.xml:8985 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." -msgstr "仕事仲間の一人がロックを取得し、解放しないまま休暇を取ってしまったら、どうしたらいいでしょう? Subversion は強制的にロックする方法を用意しています。他の誰かが持っているロックを解放することを、ロックの 破壊 と呼び、他の誰かが既にロックしているファイルを強制的にロックすることを、ロックの 横取り と呼びます。当然、仕事仲間と友人でいたいなら、軽々しく行うことではありません。" +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgstr "仕事仲間の一人がロックを取得し、解放しないまま休暇を取ってしまったら、どうしたらいいでしょう? Git は強制的にロックする方法を用意しています。他の誰かが持っているロックを解放することを、ロックの 破壊 と呼び、他の誰かが既にロックしているファイルを強制的にロックすることを、ロックの 横取り と呼びます。当然、仕事仲間と友人でいたいなら、軽々しく行うことではありません。" #. (para) #: ../source/TortoiseGit_en.xml:8995 @@ -7568,8 +7568,8 @@ msgstr "ロックの破壊・横取りは避ける" #. (para) #: ../source/TortoiseGit_en.xml:9086 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." -msgstr "ほかの誰かのロックを、断りもなく破壊・横取りすると、潜在的に作業を失う原因になります。マージ不可能なファイルの種類で作業していて、他の誰かのロックを奪った場合、自分がロックを解放すると、自由にあなたのものを上書きできます。Subversion はデータを失いませんが、ロックがもたらすはずだった、チーム作業の保護を失ってしまいます。" +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." +msgstr "ほかの誰かのロックを、断りもなく破壊・横取りすると、潜在的に作業を失う原因になります。マージ不可能なファイルの種類で作業していて、他の誰かのロックを奪った場合、自分がロックを解放すると、自由にあなたのものを上書きできます。Git はデータを失いませんが、ロックがもたらすはずだった、チーム作業の保護を失ってしまいます。" #. (title) #: ../source/TortoiseGit_en.xml:9098 @@ -7583,8 +7583,8 @@ msgstr "上記のように、ロックを使用するのに最も効果的な方 #. (para) #: ../source/TortoiseGit_en.xml:9109 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." -msgstr "ファイルやフォルダをリポジトリに追加した際に、自動的に属性を設定するように Subversion を設定できます。詳細情報は をご覧ください。" +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgstr "ファイルやフォルダをリポジトリに追加した際に、自動的に属性を設定するように Git を設定できます。詳細情報は をご覧ください。" #. (title) #: ../source/TortoiseGit_en.xml:9118 @@ -7593,8 +7593,8 @@ msgstr "ロックのフックスクリプト" #. (para) #: ../source/TortoiseGit_en.xml:9119 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." -msgstr "Subversion 1.2 以降で作成したリポジトリでは、リポジトリの hooks ディレクトリに 4 つフックテンプレートが追加されています。それぞれロック取得の前後、ロック解除の前後に呼ばれます。" +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgstr "Git 1.2 以降で作成したリポジトリでは、リポジトリの hooks ディレクトリに 4 つフックテンプレートが追加されています。それぞれロック取得の前後、ロック解除の前後に呼ばれます。" #. (para) #: ../source/TortoiseGit_en.xml:9125 @@ -8260,8 +8260,8 @@ msgstr "異なる作業コピーにある、選択したリビジョンの変更 #. (para) #: ../source/TortoiseGit_en.xml:9967 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." -msgstr "Subversion では必要なすべての情報を提供しているわけではないので、時々奇妙な結果になってしまい、ある程度解釈が必要です。それでも、トランクの出力は通常有用な結果を返すでしょう。" +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgstr "Git では必要なすべての情報を提供しているわけではないので、時々奇妙な結果になってしまい、ある程度解釈が必要です。それでも、トランクの出力は通常有用な結果を返すでしょう。" #. (para) #: ../source/TortoiseGit_en.xml:9977 @@ -8275,8 +8275,8 @@ msgstr "ログキャッシュを使用しており、メッセージの内容や #. (title) #: ../source/TortoiseGit_en.xml:9996 -msgid "Exporting a Subversion Working Copy" -msgstr "Subversion 作業コピーをエクスポート" +msgid "Exporting a Git Working Copy" +msgstr "Git 作業コピーをエクスポート" #. (primary) #: ../source/TortoiseGit_en.xml:9998 @@ -8330,8 +8330,8 @@ msgstr "単一ファイルのエクスポート" #. (para) #: ../source/TortoiseGit_en.xml:10071 -msgid "The export dialog does not allow exporting single files, even though Subversion can." -msgstr "エクスポートダイアログは、Subversion ではできる 単一ファイルのエクスポートを、許可していません。" +msgid "The export dialog does not allow exporting single files, even though Git can." +msgstr "エクスポートダイアログは、Git ではできる 単一ファイルのエクスポートを、許可していません。" #. (para) #: ../source/TortoiseGit_en.xml:10075 @@ -8427,8 +8427,8 @@ msgstr "これはほとんど行われない操作でしょうIssue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." -msgstr "この課題追跡システムとの統合は、TortoiseGit に限定されていません。ですから、いずれの Subversion クライアントでも使用できます。詳細は、TortoiseGit のソースリポジトリにある、Issue Tracker Integration Specification の全体をお読みください (リポジトリのアクセスのしかたは で説明します)。" +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgstr "この課題追跡システムとの統合は、TortoiseGit に限定されていません。ですから、いずれの Git クライアントでも使用できます。詳細は、TortoiseGit のソースリポジトリにある、Issue Tracker Integration Specification の全体をお読みください (リポジトリのアクセスのしかたは で説明します)。" #. (title) #: ../source/TortoiseGit_en.xml:10536 @@ -8713,8 +8713,8 @@ msgstr "WebSVN" #. (para) #: ../source/TortoiseGit_en.xml:10588 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." -msgstr "ViewVC や WebSVN のような、Subversion と共に使用する Web ベースのリポジトリビューアがいくつかあります。TortoiseGit は、そういったビューアとのリンクを提供します。" +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgstr "ViewVC や WebSVN のような、Git と共に使用する Web ベースのリポジトリビューアがいくつかあります。TortoiseGit は、そういったビューアとのリンクを提供します。" #. (para) #: ../source/TortoiseGit_en.xml:10600 @@ -8743,8 +8743,8 @@ msgstr "リポジトリブラウザからリンクするリポジトリビュー #. (para) #: ../source/TortoiseGit_en.xml:10684 -msgid "Because the repo viewer integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." -msgstr "リポジトリビューアとの統合は、subversion の属性にアクセスできることに依存しているため、チェックアウトした作業コピーを使用するときにだけ、結果を目にすることになります。リモートから属性を取得するのは遅い操作ですので、作動中のこの機能をリポジトリブラウザから目にすることはないでしょう。" +msgid "Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgstr "リポジトリビューアとの統合は、Git の属性にアクセスできることに依存しているため、チェックアウトした作業コピーを使用するときにだけ、結果を目にすることになります。リモートから属性を取得するのは遅い操作ですので、作動中のこの機能をリポジトリブラウザから目にすることはないでしょう。" #. (title) #: ../source/TortoiseGit_en.xml:10693 @@ -8778,8 +8778,8 @@ msgstr "設定ダイアログの一般ページ" #. (para) #: ../source/TortoiseGit_en.xml:10710 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." -msgstr " このダイアログでは、好みの言語を指定したり、Subversion 特有の設定を行うことができます。" +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." +msgstr " このダイアログでは、好みの言語を指定したり、Git 特有の設定を行うことができます。" #. (term) #: ../source/TortoiseGit_en.xml:10720 @@ -8848,13 +8848,13 @@ msgstr "共通無視パターンはバージョン管理外のファイルを、 #. (para) #: ../source/TortoiseGit_en.xml:10792 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." -msgstr "ここで指定した無視パターンは、同じPCで動作する他の Subversion クライアント (コマンドラインクライアントを含む) でも有効になることに注意してください。" +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." +msgstr "ここで指定した無視パターンは、同じPCで動作する他の Git クライアント (コマンドラインクライアントを含む) でも有効になることに注意してください。" #. (para) #: ../source/TortoiseGit_en.xml:10798 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." -msgstr "共通無視パターンを設定した Subversion 設定ファイルを使用すると、ここでした設定を上書きしてしまいます。Subversion の設定ファイルには、下にある 編集 でアクセスできます。" +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." +msgstr "共通無視パターンを設定した Git 設定ファイルを使用すると、ここでした設定を上書きしてしまいます。Git の設定ファイルには、下にある 編集 でアクセスできます。" #. (para) #: ../source/TortoiseGit_en.xml:10806 @@ -8873,13 +8873,13 @@ msgstr "このオプションはチェックアウトや更新時にコミット #. (term) #: ../source/TortoiseGit_en.xml:10834 -msgid "Subversion configuration file" -msgstr "Subversion 設定ファイル" +msgid "Git configuration file" +msgstr "Git 設定ファイル" #. (para) #: ../source/TortoiseGit_en.xml:10836 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." -msgstr "Subversion 設定ファイルを直接編集するには 編集 を使用してください。いくつかの設定は TortoiseGit では直接変更することができないため、その場合にこれが必要です。Subversion の config ファイルについての詳細情報は、Runtime Configuration Area をご覧ください。Automatic Property Setting の節には興味深い項目があり、これはここで設定します。Subversion は複数の設定情報を読み込めますが、その優先順位を知っておかなくてはならないことに注意してください。詳細は Configuration and the Windows Registry を参照してください。" +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgstr "Git 設定ファイルを直接編集するには 編集 を使用してください。いくつかの設定は TortoiseGit では直接変更することができないため、その場合にこれが必要です。Git の config ファイルについての詳細情報は、Runtime Configuration Area をご覧ください。Automatic Property Setting の節には興味深い項目があり、これはここで設定します。Git は複数の設定情報を読み込めますが、その優先順位を知っておかなくてはならないことに注意してください。詳細は Configuration and the Windows Registry を参照してください。" #. (term) #: ../source/TortoiseGit_en.xml:10861 @@ -8888,13 +8888,13 @@ msgstr ".svn ディレクトリの代わりに、 #. (para) #: ../source/TortoiseGit_en.xml:10863 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." -msgstr "web プロジェクトを使用する際、Subversion が内部情報を格納する .svn フォルダを、VS.NET は扱えません。これは Subversion のバグではありません。VS.NET とそこで使用する frontpage 拡張のバグです。この件に関してもっと調べるには をご覧ください。" +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgstr "web プロジェクトを使用する際、Git が内部情報を格納する .svn フォルダを、VS.NET は扱えません。これは Git のバグではありません。VS.NET とそこで使用する frontpage 拡張のバグです。この件に関してもっと調べるには をご覧ください。" #. (para) #: ../source/TortoiseGit_en.xml:10870 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." -msgstr "Subversion や TortoiseGit の振る舞いを変更する場合、これを制御する環境変数を設定するのに、チェックボックスを使用できます。" +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgstr "Git や TortoiseGit の振る舞いを変更する場合、これを制御する環境変数を設定するのに、チェックボックスを使用できます。" #. (para) #: ../source/TortoiseGit_en.xml:10875 @@ -8993,8 +8993,8 @@ msgstr "競合がない場合は自動的に閉じる は #. (para) #: ../source/TortoiseGit_en.xml:10993 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." -msgstr "エラーがない場合は自動的に閉じる は競合があっても常にダイアログを閉じます。ダイアログが開いたままになる条件は、Subversion が処理を継続できないようなエラーの発生です。例えば、サーバにアクセスできずに更新が失敗したり、作業コピーが最新ではなくコミットができない場合です。" +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgstr "エラーがない場合は自動的に閉じる は競合があっても常にダイアログを閉じます。ダイアログが開いたままになる条件は、Git が処理を継続できないようなエラーの発生です。例えば、サーバにアクセスできずに更新が失敗したり、作業コピーが最新ではなくコミットができない場合です。" #. (term) #: ../source/TortoiseGit_en.xml:11005 @@ -9363,13 +9363,13 @@ msgstr "除外するパス は、アイコンオーバー #. (para) #: ../source/TortoiseGit_en.xml:11407 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "f:\\development\\SVN\\Subversion では、指定したフォルダ のみ オーバーレイを無効にします。このフォルダ内の全ファイル・フォルダのオーバーレイはまだ見ることができます。" +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "f:\\development\\SVN\\Git では、指定したフォルダ のみ オーバーレイを無効にします。このフォルダ内の全ファイル・フォルダのオーバーレイはまだ見ることができます。" #. (para) #: ../source/TortoiseGit_en.xml:11412 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "f:\\development\\SVN\\Subversion* では、f:\\development\\SVN\\Subversion で始まる すべて のファイル・フォルダでオーバーレイが無効になります。このパス以下のいずれのファイル・フォルダでもオーバーレイをさせたくないという意味になります。" +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "f:\\development\\SVN\\Git* では、f:\\development\\SVN\\Git で始まる すべて のファイル・フォルダでオーバーレイが無効になります。このパス以下のいずれのファイル・フォルダでもオーバーレイをさせたくないという意味になります。" #. (para) #: ../source/TortoiseGit_en.xml:11419 @@ -9471,8 +9471,8 @@ msgstr " " #. (para) #: ../source/TortoiseGit_en.xml:11514 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." -msgstr "リポジトリごとにプロキシの設定をする必要がある場合、設定に Subversion servers ファイルを使用する必要があります。直接行う場合 編集 を使用してください。このファイルの使用法の詳細は、Runtime Configuration Area で説明しています。" +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgstr "リポジトリごとにプロキシの設定をする必要がある場合、設定に Git servers ファイルを使用する必要があります。直接行う場合 編集 を使用してください。このファイルの使用法の詳細は、Runtime Configuration Area で説明しています。" #. (para) #: ../source/TortoiseGit_en.xml:11524 @@ -9507,8 +9507,8 @@ msgstr "パスワードを繰り返し入力しなくてもいいように、Pag #. (para) #: ../source/TortoiseGit_en.xml:11564 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." -msgstr "最終的に、サーバとクライアントにSSHを設定するのは、このヘルプファイルの範疇を超えている重要なプロセスです。しかし、TortoiseGit FAQ にリストされている Subversion/TortoiseGit SSH How-To にガイドがあります。" +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." +msgstr "最終的に、サーバとクライアントにSSHを設定するのは、このヘルプファイルの範疇を超えている重要なプロセスです。しかし、TortoiseGit FAQ にリストされている Git/TortoiseGit SSH How-To にガイドがあります。" #. (title) #: ../source/TortoiseGit_en.xml:11574 @@ -9603,8 +9603,8 @@ msgstr "キーワード、特にファイルの リビジョン This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." -msgstr " このダイアログでは、Subversion のアクションに合わせて自動的に実行される、フックスクリプトのセットアップを行えます。対照的に で説明しているフックスクリプトは、クライアントのローカルで実行されます。" +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgstr " このダイアログでは、Git のアクションに合わせて自動的に実行される、フックスクリプトのセットアップを行えます。対照的に で説明しているフックスクリプトは、クライアントのローカルで実行されます。" #. (para) #: ../source/TortoiseGit_en.xml:12164 @@ -10100,8 +10100,8 @@ msgstr "Pre-update" #. (para) #: ../source/TortoiseGit_en.xml:12228 -msgid "Called before the actual Subversion update begins." -msgstr "Subversion の更新を実際に始める前に呼ばれます。" +msgid "Called before the actual Git update begins." +msgstr "Git の更新を実際に始める前に呼ばれます。" #. (term) #. (term) @@ -10212,8 +10212,8 @@ msgstr "便宜上パラメータに名前を付けましたが、フックの設 #. (para) #: ../source/TortoiseGit_en.xml:12406 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." -msgstr "Subversion の操作を、フックスクリプトが完了するまで止めておきたい場合は、スクリプトが終了するまで待機 をチェックしてください。" +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." +msgstr "Git の操作を、フックスクリプトが完了するまで止めておきたい場合は、スクリプトが終了するまで待機 をチェックしてください。" #. (para) #: ../source/TortoiseGit_en.xml:12410 @@ -10322,8 +10322,8 @@ msgstr "まれに使われる設定は、レジストリを直接編集するし #. (para) #: ../source/TortoiseGit_en.xml:12533 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." -msgstr "レジストリの HKCU\\Software\\TortoiseGit\\ConfigDir を使用して、Subversion 設定ファイルの場所を異なる場所に指定できます。これは TortoiseGit のすべての動作に影響を与えます。" +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgstr "レジストリの HKCU\\Software\\TortoiseGit\\ConfigDir を使用して、Git 設定ファイルの場所を異なる場所に指定できます。これは TortoiseGit のすべての動作に影響を与えます。" #. (term) #: ../source/TortoiseGit_en.xml:12542 @@ -10387,8 +10387,8 @@ msgstr "ログダイアログでは、ファイルについてsh用事する際 #. (title) #: ../source/TortoiseGit_en.xml:12623 -msgid "Subversion Working Folders" -msgstr "Subversion の作業フォルダ" +msgid "Git Working Folders" +msgstr "Git の作業フォルダ" #. (primary) #: ../source/TortoiseGit_en.xml:12625 @@ -10402,8 +10402,8 @@ msgstr "_svn フォルダ" #. (para) #: ../source/TortoiseGit_en.xml:12630 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." -msgstr "web プロジェクトを使用する際、Subversion が内部情報を格納する .svn フォルダを、VS.NET 2003 は扱えません。これは Subversion のバグではありません。VS.NET 2003 とそこで使用する frontpage 拡張のバグです。" +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgstr "web プロジェクトを使用する際、Git が内部情報を格納する .svn フォルダを、VS.NET 2003 は扱えません。これは Git のバグではありません。VS.NET 2003 とそこで使用する frontpage 拡張のバグです。" #. (para) #: ../source/TortoiseGit_en.xml:12637 @@ -10412,8 +10412,8 @@ msgstr "注: このバグは VS2005 以降で修正されています。" #. (para) #: ../source/TortoiseGit_en.xml:12641 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." -msgstr "Subversion の 1.3.0 と TortoiseGit では、環境変数 SVN_ASP_DOT_NET_HACK を設定できます。この環境変数が設定されていると、Subversion は .svn フォルダではなく _svn フォルダを使用します。環境変数が効果を現すにはシェルを再起動しなければなりません。通常 PC を再起動することを意味します。簡単にできるように、設定ダイアログの一般ページにあるチェックボックスで設定できます。 をご覧ください。" +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgstr "Git の 1.3.0 と TortoiseGit では、環境変数 SVN_ASP_DOT_NET_HACK を設定できます。この環境変数が設定されていると、Git は .svn フォルダではなく _svn フォルダを使用します。環境変数が効果を現すにはシェルを再起動しなければなりません。通常 PC を再起動することを意味します。簡単にできるように、設定ダイアログの一般ページにあるチェックボックスで設定できます。 をご覧ください。" #. (para) #: ../source/TortoiseGit_en.xml:12651 @@ -10467,8 +10467,8 @@ msgstr "ファイルのバージョン番号" #. (para) #: ../source/TortoiseGit_en.xml:12702 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." -msgstr "SubWCRev は、Subversion の作業コピーの状態を読み取り、オプションでテンプレートファイルのキーワード置換を行うのに使用する、Windows コンソールアプリケーションです。ビルドプロセスの一部として、ビルドするものに作業コピーの情報を組み込むのにしばしば利用します。典型的なのは、About ボックスにリビジョン番号を含めるのに使用することでしょう。" +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgstr "SubWCRev は、Git の作業コピーの状態を読み取り、オプションでテンプレートファイルのキーワード置換を行うのに使用する、Windows コンソールアプリケーションです。ビルドプロセスの一部として、ビルドするものに作業コピーの情報を組み込むのにしばしば利用します。典型的なのは、About ボックスにリビジョン番号を含めるのに使用することでしょう。" #. (title) #: ../source/TortoiseGit_en.xml:12716 @@ -10477,8 +10477,8 @@ msgstr "SubWCRev コマンドライン" #. (para) #: ../source/TortoiseGit_en.xml:12717 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." -msgstr "SubWCRev は作業コピーの全ファイルの Subversion 状態を読み込みます。デフォルトでは外部参照は除外します。検出した最も大きいコミットリビジョン番号と、そのタイムスタンプを記録します。また、作業コピーの手元の変更点か更新リビジョンが混ざっているのも記録します。リビジョン番号や更新リビジョン範囲、変更状態を標準出力に出力します。" +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgstr "SubWCRev は作業コピーの全ファイルの Git 状態を読み込みます。デフォルトでは外部参照は除外します。検出した最も大きいコミットリビジョン番号と、そのタイムスタンプを記録します。また、作業コピーの手元の変更点か更新リビジョンが混ざっているのも記録します。リビジョン番号や更新リビジョン範囲、変更状態を標準出力に出力します。" #. (para) #: ../source/TortoiseGit_en.xml:12725 @@ -10975,8 +10975,8 @@ msgstr "ロック作成時に入力したコメントです。" #. (para) #: ../source/TortoiseGit_en.xml:13031 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " -msgstr "他のプログラムから Subversion のリビジョン情報にアクセスする必要がある場合、SubWCRev のCOM インターフェースを使用できます。作成するオブジェクトは SubWCRev.object で、以下のメソッドをサポートしています。" +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgstr "他のプログラムから Git のリビジョン情報にアクセスする必要がある場合、SubWCRev のCOM インターフェースを使用できます。作成するオブジェクトは SubWCRev.object で、以下のメソッドをサポートしています。" #. (programlisting) #: ../source/TortoiseGit_en.xml:13149 @@ -11253,8 +11253,8 @@ msgstr "FAQ" #. (para) #: ../source/TortoiseGit_en.xml:13237 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "TortoiseGit は常に開発中のため、時々完全にはドキュメントを最新に保守できないことがあります。そこで、TortoiseGit メーリングリスト dev@TortoiseGit.tigris.org や users@TortoiseGit.tigris.org でされた質問から選んだ内容を、オンライン FAQ で管理しています。" +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "TortoiseGit は常に開発中のため、時々完全にはドキュメントを最新に保守できないことがあります。そこで、TortoiseGit メーリングリスト tortoisegit-dev@googlegroups.com や tortoisegit-users@googlegroups.com でされた質問から選んだ内容を、オンライン FAQ で管理しています。" #. (para) #: ../source/TortoiseGit_en.xml:13249 @@ -11263,8 +11263,8 @@ msgstr "また私たちは、プロジェクトの users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." -msgstr "回答がない疑問がある場合、質問する最善の場所はメーリングリストです。users@TortoiseGit.tigris.org は TortoiseGit を使用する上で疑問がある場合に使用します。TortoiseGit を開発する上での手助けが必要なら、dev@TortoiseGit.tigris.org での議論に参加するべきです。" +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." +msgstr "回答がない疑問がある場合、質問する最善の場所はメーリングリストです。tortoisegit-users@googlegroups.com は TortoiseGit を使用する上で疑問がある場合に使用します。TortoiseGit を開発する上での手助けが必要なら、tortoisegit-dev@googlegroups.com での議論に参加するべきです。" #. (title) #: ../source/TortoiseGit_en.xml:13275 @@ -11299,7 +11299,7 @@ msgstr "ひとつのファイルを移動・コピーするには、 #. (para) #: ../source/TortoiseGit_en.xml:13302 msgid "The recommended way is by right-dragging the files to the new location. Simply right-click on the files you want to move/copy without releasing the mouse button. Then drag the files to the new location and release the mouse button. A context menu will appear where you can either choose Context MenuSVN Copy versioned files here. or Context MenuSVN Move versioned files here." -msgstr "お勧めの方法は、ファイルを新しい場所に 右ドラッグ することです。移動・コピーしたいファイルの上で、単に 右クリック したままにしてください。そのまま新しい場所にドラッグし、マウスボタンを放します。現れたコンテキストメニューで、コンテキストメニューここの Subversion にコピー なり、コンテキストメニューSVN バージョン管理ファイルをここにコピーする を選択してください。" +msgstr "お勧めの方法は、ファイルを新しい場所に 右ドラッグ することです。移動・コピーしたいファイルの上で、単に 右クリック したままにしてください。そのまま新しい場所にドラッグし、マウスボタンを放します。現れたコンテキストメニューで、コンテキストメニューここの Git にコピー なり、コンテキストメニューSVN バージョン管理ファイルをここにコピーする を選択してください。" #. (title) #: ../source/TortoiseGit_en.xml:13330 @@ -11323,8 +11323,8 @@ msgstr "空のメッセージ" #. (para) #: ../source/TortoiseGit_en.xml:13340 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." -msgstr "ログメッセージを空にしてコミットするのを防ぐには、2 つ方法があります。TortoiseGit 特有の方法と、Subversion クライアント全てで使用できる方法ですがサーバに直接アクセスできる必要があります。" +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." +msgstr "ログメッセージを空にしてコミットするのを防ぐには、2 つ方法があります。TortoiseGit 特有の方法と、Git クライアント全てで使用できる方法ですがサーバに直接アクセスできる必要があります。" #. (title) #: ../source/TortoiseGit_en.xml:13346 @@ -11343,8 +11343,8 @@ msgstr "サーバのリポジトリフォルダには、hooksOK button disabled until the log message is long enough then please use the method described below." -msgstr "TortoiseGit 以外に他の Subversion クライアントも使用するようなときに、この方法をお勧めします。欠点は、コミットがサーバによって拒否され、ユーザにエラーメッセージが返ることです。クライアントには、コミットの前に拒否されるかどうかわかりません。ログメッセージが十分長くなるまで、TortoiseGit が OK ボタンを無効にするようにしたければ、以下で説明する方法で行ってください。" +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgstr "TortoiseGit 以外に他の Git クライアントも使用するようなときに、この方法をお勧めします。欠点は、コミットがサーバによって拒否され、ユーザにエラーメッセージが返ることです。クライアントには、コミットの前に拒否されるかどうかわかりません。ログメッセージが十分長くなるまで、TortoiseGit が OK ボタンを無効にするようにしたければ、以下で説明する方法で行ってください。" #. (title) #: ../source/TortoiseGit_en.xml:13373 @@ -11490,8 +11490,8 @@ msgstr "TortoiseGit は決してデータを失わないため、巻き #. (para) #: ../source/TortoiseGit_en.xml:13563 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." -msgstr "リポジトリからデータを削除する唯一の方法は、Subversion コマンドラインツールの svnadmin を使うことです。この実行方法の説明は、Repository Maintenance にあります。(訳注: 日本語訳は Subversion によるバージョン管理 にあります)" +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgstr "リポジトリからデータを削除する唯一の方法は、Git コマンドラインツールの svnadmin を使うことです。この実行方法の説明は、Repository Maintenance にあります。(訳注: 日本語訳は Git によるバージョン管理 にあります)" #. (title) #: ../source/TortoiseGit_en.xml:13574 @@ -11555,8 +11555,8 @@ msgstr "プロジェクトにあるフォルダに svn:externalsnot call the CLI but uses the Subversion library directly." -msgstr "TortoiseGit で行うことと同等な物が CLI にありますが、TortoiseGit が CLI を呼ぶことはなく、直接 Subversion ライブラリを使用するのを覚えていてください。" +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." +msgstr "TortoiseGit で行うことと同等な物が CLI にありますが、TortoiseGit が CLI を呼ぶことはなく、直接 Git ライブラリを使用するのを覚えていてください。" #. (para) #: ../source/TortoiseGit_en.xml:14801 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." -msgstr "TortoiseGit のバグを見つけたら、Subversion の問題か TortoiseGit の問題かを切り分けるために、CLI を使用してそれを再現するようにお願いするかもしれません。このリファレンスで、どのコマンドを行うべきか確認してください。" +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." +msgstr "TortoiseGit のバグを見つけたら、Git の問題か TortoiseGit の問題かを切り分けるために、CLI を使用してそれを再現するようにお願いするかもしれません。このリファレンスで、どのコマンドを行うべきか確認してください。" #. (title) #: ../source/TortoiseGit_en.xml:14809 @@ -12851,8 +12851,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14859 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." -msgstr "複数の項目を更新するのに、現在の Subversion では不可分操作できません。そこで TortoiseGit は、まず HEADリビジョンをリポジトリから探し出し、複数のリビジョン場混じった作業コピーを作らないように、特定のリビジョン番号を持つすべての項目を更新します。" +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgstr "複数の項目を更新するのに、現在の Git では不可分操作できません。そこで TortoiseGit は、まず HEADリビジョンをリポジトリから探し出し、複数のリビジョン場混じった作業コピーを作らないように、特定のリビジョン番号を持つすべての項目を更新します。" #. (para) #: ../source/TortoiseGit_en.xml:14866 @@ -12888,8 +12888,8 @@ msgstr "トップフォルダのみ更新する がチェ #. (para) #: ../source/TortoiseGit_en.xml:14894 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." -msgstr "TortoiseGit ではコミットダイアログを使って複数の Subversion コマンドを実行します。最初は、コミットできる作業コピーの項目について状態チェックを行います。リストを確認し、コミットするよう選択したファイルと BASE に diff をかけることができます。" +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgstr "TortoiseGit ではコミットダイアログを使って複数の Git コマンドを実行します。最初は、コミットできる作業コピーの項目について状態チェックを行います。リストを確認し、コミットするよう選択したファイルと BASE に diff をかけることができます。" #. (screen) #. (screen) @@ -12909,8 +12909,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14904 #: ../source/TortoiseGit_en.xml:14992 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." -msgstr "バージョン管理外のファイルを表示する にチェックがあると、TortoiseGit は作業コピーの階層にあるバージョン管理外のファイルやフォルダも (無視ルールを考慮して) 表示します。svn status コマンドはバージョン管理外のフォルダ以下は検索しないため、この特殊な機能は直接対応する Subversion コマンドがありません。" +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." +msgstr "バージョン管理外のファイルを表示する にチェックがあると、TortoiseGit は作業コピーの階層にあるバージョン管理外のファイルやフォルダも (無視ルールを考慮して) 表示します。svn status コマンドはバージョン管理外のフォルダ以下は検索しないため、この特殊な機能は直接対応する Git コマンドがありません。" #. (para) #: ../source/TortoiseGit_en.xml:14912 @@ -12931,8 +12931,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14919 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." -msgstr "OK をクリックすると、Subversion のコミットをそこで行います。すべてのファイルの選択チェックボックスを初期状態からはずすと、TortoiseGit は作業コピーに対し再帰的コミットを一度行います。ファイルを選択しない場合、コミットコマンドラインで個々のパスを指定して、非再帰的コミット (-N) を使用しなければなりません。" +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgstr "OK をクリックすると、Git のコミットをそこで行います。すべてのファイルの選択チェックボックスを初期状態からはずすと、TortoiseGit は作業コピーに対し再帰的コミットを一度行います。ファイルを選択しない場合、コミットコマンドラインで個々のパスを指定して、非再帰的コミット (-N) を使用しなければなりません。" #. (screen) #: ../source/TortoiseGit_en.xml:14927 @@ -13118,8 +13118,8 @@ msgstr "第一段階として、作業コピー内で取り消しが行える項 #. (para) #: ../source/TortoiseGit_en.xml:15072 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." -msgstr "OK をクリックすると、Subversion の revert が行われます。ファイル選択チェックボックスをすべてデフォルトのままにした場合、TortoiseGit は 再帰 (-R) revert を作業コピーに対して行います。ファイルの選択を外すと、revert コマンドラインに選択したパスをすべて、個々に指定しなければなりません。" +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgstr "OK をクリックすると、Git の revert が行われます。ファイル選択チェックボックスをすべてデフォルトのままにした場合、TortoiseGit は 再帰 (-R) revert を作業コピーに対して行います。ファイルの選択を外すと、revert コマンドラインに選択したパスをすべて、個々に指定しなければなりません。" #. (screen) #: ../source/TortoiseGit_en.xml:15079 @@ -13273,8 +13273,8 @@ msgstr "この形式はバージョン管理外フォルダからアクセスし #. (para) #: ../source/TortoiseGit_en.xml:15174 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." -msgstr "作業コピーを別の場所にエクスポートするのに、Subversion ライブラリを使用ません。そのため、相当するコマンドラインが存在しません。" +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." +msgstr "作業コピーを別の場所にエクスポートするのに、Git ライブラリを使用ません。そのため、相当するコマンドラインが存在しません。" #. (para) #: ../source/TortoiseGit_en.xml:15179 @@ -13384,8 +13384,8 @@ msgstr "TortoiseGit は、作業コピーと BASE リビジョンを比較して #. (para) #: ../source/TortoiseGit_en.xml:15260 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." -msgstr "パッチと作業コピーが同じリビジョンになっていなければ、パッチの適用はやりにくい作業です。運良く TortoiseMerge を使用できます。TortoiseMerge は Subversion に該当する機能がありません。" +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." +msgstr "パッチと作業コピーが同じリビジョンになっていなければ、パッチの適用はやりにくい作業です。運良く TortoiseMerge を使用できます。TortoiseMerge は Git に該当する機能がありません。" #. (title) #: ../source/TortoiseGit_en.xml:15274 @@ -13404,8 +13404,8 @@ msgstr "オーバーレイの優先度" #. (para) #: ../source/TortoiseGit_en.xml:15289 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." -msgstr "すべてのファイルやフォルダは、Subversion ライブラリが報告する Subversion の状態値を持っています。コマンドラインクライアントでは、1 文字のコードで表示しますが、TortoiseGit ではアイコンオーバーレイでグラフィカルに表示します。オーバーレイアイコンの数は非常に制限されているので、オーバーレイアイコンごとに複数の状態値を持つこともありえます。" +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgstr "すべてのファイルやフォルダは、Git ライブラリが報告する Git の状態値を持っています。コマンドラインクライアントでは、1 文字のコードで表示しますが、TortoiseGit ではアイコンオーバーレイでグラフィカルに表示します。オーバーレイアイコンの数は非常に制限されているので、オーバーレイアイコンごとに複数の状態値を持つこともありえます。" #. (para) #: ../source/TortoiseGit_en.xml:15297 @@ -13429,13 +13429,13 @@ msgstr " バージョン管理に The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." -msgstr " Subversion 内 オーバーレイアイコンは、通常状態のファイルや、まだ状態が分からないファイルに表示します。これは、TortoiseGit が状態を取得するバックグラウンドプロセスを用いているためで、それはオーバーレイアイコンを更新する数秒前かもしれません。" +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgstr " Git 内 オーバーレイアイコンは、通常状態のファイルや、まだ状態が分からないファイルに表示します。これは、TortoiseGit が状態を取得するバックグラウンドプロセスを用いているためで、それはオーバーレイアイコンを更新する数秒前かもしれません。" #. (para) #: ../source/TortoiseGit_en.xml:15340 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." -msgstr " 要ロック オーバーレイアイコンは、svn:needs-lock 属性を設定しているファイルに表示されます。Subversion 1.4.0 以降で作成した作業コピー向けに、svn:needs-lock 状態は、Subversion がローカルにキャッシュし、このオーバーレイアイコンを表示するかどうか決めるにに使用します。1.4.x 以前の形式の作業コピー向けには、TortoiseGit は読込専用ファイルにこのオーバーレイアイコンを表示します。Subversion は自動的に作業コピーをアップグレードしますが、svn:needs-lock 属性のキャッシュは、そのファイル自体の更新が発生するまで更新されません。" +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgstr " 要ロック オーバーレイアイコンは、svn:needs-lock 属性を設定しているファイルに表示されます。Git 1.4.0 以降で作成した作業コピー向けに、svn:needs-lock 状態は、Git がローカルにキャッシュし、このオーバーレイアイコンを表示するかどうか決めるにに使用します。1.4.x 以前の形式の作業コピー向けには、TortoiseGit は読込専用ファイルにこのオーバーレイアイコンを表示します。Git は自動的に作業コピーをアップグレードしますが、svn:needs-lock 属性のキャッシュは、そのファイル自体の更新が発生するまで更新されません。" #. (para) #: ../source/TortoiseGit_en.xml:15354 @@ -13454,13 +13454,13 @@ msgstr " バージョ #. (para) #: ../source/TortoiseGit_en.xml:15375 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." -msgstr "Subversion の状態が none (作業コピーにない項目) の場合はオーバーレイを表示しません。無視 や バージョン管理外 のオーバーレイを無効にした場合は、そのファイルにもオーバーレイを表示しません。" +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgstr "Git の状態が none (作業コピーにない項目) の場合はオーバーレイを表示しません。無視 や バージョン管理外 のオーバーレイを無効にした場合は、そのファイルにもオーバーレイを表示しません。" #. (para) #: ../source/TortoiseGit_en.xml:15382 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." -msgstr "ファイルは Subversion 状態を 1 つしか持ちません。例えば、ファイルをローカルで変更し、そのファイルを同時に削除するようマークをつけることができます。Subversion は状態値を 1 つ返します。この場合、削除です。この優先順は、Subversion で定義しています。" +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." +msgstr "ファイルは Git 状態を 1 つしか持ちません。例えば、ファイルをローカルで変更し、そのファイルを同時に削除するようマークをつけることができます。Git は状態値を 1 つ返します。この場合、削除です。この優先順は、Git で定義しています。" #. (para) #: ../source/TortoiseGit_en.xml:15389 @@ -13504,23 +13504,23 @@ msgstr "SSH を用いた安全な svnserve" #. (para) #: ../source/TortoiseGit_en.xml:15452 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." -msgstr "本節は、Subversion と TortoiseGit で svn+ssh プロトコルを使用するよう設定する段階的ガイドです。サーバにログインするのに、すでに認証済み SSH 接続を使用している場合、すでに本節で説明する段階に達しています。さらなる詳細は、Subversion book で見つかるでしょう。まだ SSH を使用しておらず、Subversion を保護するために SSH を使用したい場合は、Subversion のユーザごとに、独立した SSH のユーザアカウントをサーバに用意しなくてもすむ、簡単な方法をガイドします。" +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." +msgstr "本節は、Git と TortoiseGit で svn+ssh プロトコルを使用するよう設定する段階的ガイドです。サーバにログインするのに、すでに認証済み SSH 接続を使用している場合、すでに本節で説明する段階に達しています。さらなる詳細は、Git book で見つかるでしょう。まだ SSH を使用しておらず、Git を保護するために SSH を使用したい場合は、Git のユーザごとに、独立した SSH のユーザアカウントをサーバに用意しなくてもすむ、簡単な方法をガイドします。" #. (para) #: ../source/TortoiseGit_en.xml:15462 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." -msgstr "この実装では、全 Subversion のユーザ用に、ひとつの SSH ユーザアカウントを作成し、実際の Subversion ユーザで分けるのに、異なる認証鍵を使用します。" +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." +msgstr "この実装では、全 Git のユーザ用に、ひとつの SSH ユーザアカウントを作成し、実際の Git ユーザで分けるのに、異なる認証鍵を使用します。" #. (para) #: ../source/TortoiseGit_en.xml:15467 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." -msgstr "この付録では、すでに Subversion のツールをインストールしてあり、このマニュアルですでに述べたようなリポジトリを作成してあると仮定しています。SSH とともに使用する場合、svnserve をサービスやデーモンとして起動するべきでないということに注意してください。" +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgstr "この付録では、すでに Git のツールをインストールしてあり、このマニュアルですでに述べたようなリポジトリを作成してあると仮定しています。SSH とともに使用する場合、svnserve をサービスやデーモンとして起動するべきでないということに注意してください。" #. (para) #: ../source/TortoiseGit_en.xml:15473 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" -msgstr "ここの情報の多くは、Marc Logemann が提供しているチュートリアル (www.logemann.org にあります) から来ています。Windows サーバに設定するさらなる情報は、Thorsten Müller が提供しています。ありがとうございます!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgstr "ここの情報の多くは、Marc Logemann が提供しているチュートリアル (www.logemann.org にあります) から来ています。Windows サーバに設定するさらなる情報は、Thorsten Müller が提供しています。ありがとうございます!" #. (title) #: ../source/TortoiseGit_en.xml:15484 @@ -13540,8 +13540,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15494 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." -msgstr "注意すべき点は、Subversion をソースからビルドする際、./configure に引数を何も与えない場合、Subversion は /usr/local に bin ディレクトリを作成し、そこにバイナリを配置するということです。SSH でのトンネリングモードを使用する場合、ユーザが SSH でログインするには、svnserve プログラムやその他のバイナリを、実行する必要があるということを意識しなければなりません。このため、PATH 変数に/usr/local/bin を含めるか、/usr/sbin ディレクトリやその他の PATH にある共通のディレクトリに、バイナリへのシンボリックリンクを作成するかを行う必要があります。" +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgstr "注意すべき点は、Git をソースからビルドする際、./configure に引数を何も与えない場合、Git は /usr/local に bin ディレクトリを作成し、そこにバイナリを配置するということです。SSH でのトンネリングモードを使用する場合、ユーザが SSH でログインするには、svnserve プログラムやその他のバイナリを、実行する必要があるということを意識しなければなりません。このため、PATH 変数に/usr/local/bin を含めるか、/usr/sbin ディレクトリやその他の PATH にある共通のディレクトリに、バイナリへのシンボリックリンクを作成するかを行う必要があります。" #. (para) #: ../source/TortoiseGit_en.xml:15507 @@ -13699,8 +13699,8 @@ msgstr "TortoiseGit と併せた SSH のテスト" #. (para) #: ../source/TortoiseGit_en.xml:15657 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." -msgstr "ここまで、SSH を用いたログインができるかどうかだけをテストしてきました。今度は、SSH 接続で実際に svnserve を実行できるかを、確認する必要があります。サーバでは、以下のように /home/svnuser/.ssh/authorized_keys を変更して、たくさんの subversion 作者に同じシステムアカウント svnuser を許可します。subversion 作者は同じログイン名ですが、異なる認証鍵を使用することに注意してください。そのため、全ユーザ用に 1 行追加しなければなりません。" +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." +msgstr "ここまで、SSH を用いたログインができるかどうかだけをテストしてきました。今度は、SSH 接続で実際に svnserve を実行できるかを、確認する必要があります。サーバでは、以下のように /home/svnuser/.ssh/authorized_keys を変更して、たくさんの Git 作者に同じシステムアカウント svnuser を許可します。Git 作者は同じログイン名ですが、異なる認証鍵を使用することに注意してください。そのため、全ユーザ用に 1 行追加しなければなりません。" #. (para) #: ../source/TortoiseGit_en.xml:15666 @@ -13819,8 +13819,8 @@ msgstr "用語集" #. (para) #: ../source/TortoiseGit_en.xml:15809 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "ファイルやディレクトリをリポジトリに追加する Subversion コマンドです。新しい項目は、コミットした際にリポジトリに追加されます。" +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "ファイルやディレクトリをリポジトリに追加する Git コマンドです。新しい項目は、コミットした際にリポジトリに追加されます。" #. (glossterm) #: ../source/TortoiseGit_en.xml:15817 @@ -13854,23 +13854,23 @@ msgstr "ブランチ" #. (para) #: ../source/TortoiseGit_en.xml:15851 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "ある点で開発が2つの独立したパスに分岐したことをと表す、リビジョン管理システムの用語です。メインラインを不安定にせずに新機能の開発を行うように、メインの開発ラインからブランチを作成できます。また、今後バグフィックスしか行わない安定版リリースのブランチを作成し、新機能の開発は不安定なトランクで行えます。Subversion のブランチは、簡易コピー として実装されています。" +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "ある点で開発が2つの独立したパスに分岐したことをと表す、リビジョン管理システムの用語です。メインラインを不安定にせずに新機能の開発を行うように、メインの開発ラインからブランチを作成できます。また、今後バグフィックスしか行わない安定版リリースのブランチを作成し、新機能の開発は不安定なトランクで行えます。Git のブランチは、簡易コピー として実装されています。" #. (para) #: ../source/TortoiseGit_en.xml:15866 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "空のディレクトリにリポジトリからバージョン管理下のファイルをダウンロードし、手元の作業コピーを作成する Subversion コマンドです。" +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "空のディレクトリにリポジトリからバージョン管理下のファイルをダウンロードし、手元の作業コピーを作成する Git コマンドです。" #. (para) #: ../source/TortoiseGit_en.xml:15875 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "以下 Subversion book から引用します。作業コピーを再帰的にクリーンアップ (ロックの削除、未完操作の回復) を行います。作業コピーがロックされています というエラーが出続ける場合、このコマンドを実行し、古くなったロックを削除し、作業コピーをまた使えるようにします。 ここで言う ロック は、ファイルシステムのロックを指しており、リポジトリのロックではないことに注意してください。" +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "以下 Git book から引用します。作業コピーを再帰的にクリーンアップ (ロックの削除、未完操作の回復) を行います。作業コピーがロックされています というエラーが出続ける場合、このコマンドを実行し、古くなったロックを削除し、作業コピーをまた使えるようにします。 ここで言う ロック は、ファイルシステムのロックを指しており、リポジトリのロックではないことに注意してください。" #. (para) #: ../source/TortoiseGit_en.xml:15892 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "手元の作業コピーの変更点をリポジトリに渡し、リポジトリのリビジョンを新しく作成するのに使用する Subversion コマンドです。" +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "手元の作業コピーの変更点をリポジトリに渡し、リポジトリのリビジョンを新しく作成するのに使用する Git コマンドです。" #. (glossterm) #: ../source/TortoiseGit_en.xml:15900 @@ -13879,8 +13879,8 @@ msgstr "競合" #. (para) #: ../source/TortoiseGit_en.xml:15902 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "リポジトリの変更が手元にマージされる際、時には同じ行に変更がある場合があります。この場合、Subversion はどちらを使用するか自動的に決定できません。これを競合と呼びます。それ以降の変更をコミットする前には、ファイルを手で修正し競合を解消しなければなりません。" +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "リポジトリの変更が手元にマージされる際、時には同じ行に変更がある場合があります。この場合、Git はどちらを使用するか自動的に決定できません。これを競合と呼びます。それ以降の変更をコミットする前には、ファイルを手で修正し競合を解消しなければなりません。" #. (glossterm) #: ../source/TortoiseGit_en.xml:15912 @@ -13889,8 +13889,8 @@ msgstr "コピー" #. (para) #: ../source/TortoiseGit_en.xml:15914 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "Subversion リポジトリでは、単一ファイルやツリー全体のコピーを作成できます。これは、領域を消費しないように、オリジナルへのリンクに少し似ている 簡易コピー で実装されています。コピーの作成ではコピー内に履歴を保存します。そのためコピーされる前についても追跡できます。" +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "Git リポジトリでは、単一ファイルやツリー全体のコピーを作成できます。これは、領域を消費しないように、オリジナルへのリンクに少し似ている 簡易コピー で実装されています。コピーの作成ではコピー内に履歴を保存します。そのためコピーされる前についても追跡できます。" #. (para) #: ../source/TortoiseGit_en.xml:15926 @@ -13914,8 +13914,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15957 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "リポジトリ用の Subversion が持つファイルシステムバックエンドです。ネットワーク共有が可能です。1.2 以降のリポジトリのデフォルトです。" +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "リポジトリ用の Git が持つファイルシステムバックエンドです。ネットワーク共有が可能です。1.2 以降のリポジトリのデフォルトです。" #. (para) #: ../source/TortoiseGit_en.xml:15966 @@ -13934,7 +13934,7 @@ msgstr "リポジトリにあるファイルやフォルダ #. (para) #: ../source/TortoiseGit_en.xml:15982 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "ひとつのリビジョンで、フォルダ階層のエントリをリポジトリにインポートするコマンドです。" #. (para) @@ -13979,8 +13979,8 @@ msgstr "パッチ" #. (para) #: ../source/TortoiseGit_en.xml:16035 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "作業コピーにテキストファイルの変更のみある場合、Unified Diff 形式で変更内容の単一ファイルを作成するのに、Subversion の Diff コマンドを使用できます。この形のファイルは、よく パッチ と言われており、他の誰か (やメーリングリスト) にメールで送ったり、他の作業コピーに適用したりできます。コミットアクセスできない人は、権限のあるコミッタが適用するように、変更をパッチファイルにして送ることができます。また、変更に自信がなければ、他の人に見てもらうようにパッチを送れます。" +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "作業コピーにテキストファイルの変更のみある場合、Unified Diff 形式で変更内容の単一ファイルを作成するのに、Git の Diff コマンドを使用できます。この形のファイルは、よく パッチ と言われており、他の誰か (やメーリングリスト) にメールで送ったり、他の作業コピーに適用したりできます。コミットアクセスできない人は、権限のあるコミッタが適用するように、変更をパッチファイルにして送ることができます。また、変更に自信がなければ、他の人に見てもらうようにパッチを送れます。" #. (glossterm) #: ../source/TortoiseGit_en.xml:16048 @@ -13989,8 +13989,8 @@ msgstr "属性" #. (para) #: ../source/TortoiseGit_en.xml:16050 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "ディレクトリやファイルをバージョン管理下に置くのに加えて、Subversion はバージョン管理下のメタデータを追加できます。これは、バージョン管理下のディレクトリ・ファイルごとの 属性 として参照されます。属性には、レジストリキーと同じように、それぞれ名前と値があります。Subversion には、svn:eol-style のような内部で使用する特殊な属性がいくつかあります。TortoiseGit にも tsvn:logminsize のような特殊な属性があります。お好みの名前と値を持つ属性の追加もできます。" +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "ディレクトリやファイルをバージョン管理下に置くのに加えて、Git はバージョン管理下のメタデータを追加できます。これは、バージョン管理下のディレクトリ・ファイルごとの 属性 として参照されます。属性には、レジストリキーと同じように、それぞれ名前と値があります。Git には、svn:eol-style のような内部で使用する特殊な属性がいくつかあります。TortoiseGit にも tsvn:logminsize のような特殊な属性があります。お好みの名前と値を持つ属性の追加もできます。" #. (para) #: ../source/TortoiseGit_en.xml:16065 @@ -14019,8 +14019,8 @@ msgstr "作業コピーのファイルが、マージ後に競合状態になっ #. (para) #: ../source/TortoiseGit_en.xml:16105 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "作業コピーを最後に更新したときから、Subversion はそれぞれのファイルの 当初の コピーを手元に保持しています。変更を行い、その変更を取り消したい場合は、取り消し コマンドを使用して当初のコピーに戻せます。" +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "作業コピーを最後に更新したときから、Git はそれぞれのファイルの 当初の コピーを手元に保持しています。変更を行い、その変更を取り消したい場合は、取り消し コマンドを使用して当初のコピーに戻せます。" #. (glossterm) #: ../source/TortoiseGit_en.xml:16114 @@ -14054,13 +14054,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:16146 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Subversion のよく使われる省略表現。" +msgid "A frequently-used abbreviation for Git." +msgstr "Git のよく使われる省略表現。" #. (para) #: ../source/TortoiseGit_en.xml:16149 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "svnserve リポジトリサーバで使われる、Subversion カスタムプロトコルの名前です。" +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "svnserve リポジトリサーバで使われる、Git カスタムプロトコルの名前です。" #. (para) #: ../source/TortoiseGit_en.xml:16158 @@ -14069,7 +14069,7 @@ msgstr "ちょうど リビジョンへの更新 が履歴上の #. (para) #: ../source/TortoiseGit_en.xml:16172 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "リポジトリから作業コピーへ最新の変更点を取得するコマンド。作業コピーの変更点に、他の人が行った変更をマージします。" #. (glossterm) @@ -14103,24 +14103,24 @@ msgstr "翻訳" #~ msgid "Hook Scripts" #~ msgstr "フックスクリプト" #~ msgid "" -#~ "Subversion uses the / as the path delimiter in all " +#~ "Git uses the / as the path delimiter in all " #~ "internal pathnames, and all pattern matching is done against this style " #~ "of path names. If you want to use a path delimiter in your ignore " #~ "pattern, be sure to use /, and not the Windows " #~ "backslash." #~ msgstr "" -#~ "Subversion は、内部のパス名すべてで、パス区切り文字に // を使用し、パス名のパターンマッチすべてをこの形で行います。無視パ" #~ "ターンにパス区切り文字を使用する場合、必ず / を使用し、" #~ "Windows の ￥ を使用しないでください。" #~ msgid "" -#~ "Subversion uses this pattern matching against every path presented to it " +#~ "Git uses this pattern matching against every path presented to it " #~ "for action. These paths are generally relative to the directory being " #~ "acted upon for import, add, commit, etc. The matching pattern therefore " #~ "has to take account of the fact that there may or may not be path " #~ "components before the filename." #~ msgstr "" -#~ "Subversion は上記のパターンマッチを、アクションで与えられたパスすべてに対" +#~ "Git は上記のパターンマッチを、アクションで与えられたパスすべてに対" #~ "して行います。このパスは一般的に、インポート・追加・コミットなどで実行され" #~ "るディレクトリに関係します。そのためパターンマッチは、ファイル名の前にパス" #~ "部分がある可能性を考慮しなければなりません。" @@ -14130,12 +14130,12 @@ msgstr "翻訳" #~ "Fred.c but not subdir/Fred.c. This " #~ "is significant if you add a folder which contains some files that you " #~ "want to be ignored, because those filenames will be preceded with the " -#~ "folder name when Subversion compares them with the ignore pattern." +#~ "folder name when Git compares them with the ignore pattern." #~ msgstr "" #~ "パスにディレクトリ名が含まれる場合、マッチングアルゴリズムはこれを取り除き" #~ "ません。つまり、パターン Fred.* はFred.c にはマッチしますが、subdir/Fred.c にはマッチし" -#~ "ません。無視したいファイルを含むフォルダを追加する場合、Subversionが無視パ" +#~ "ません。無視したいファイルを含むフォルダを追加する場合、Gitが無視パ" #~ "ターンと比較する際に、そのファイル名の前にはフォルダ名がありますので、上記" #~ "は重要な問題になります。" #~ msgid "" @@ -14278,13 +14278,13 @@ msgstr "翻訳" #~ "また、サーバにマージ追跡データベースがなければ、情報を集めるのに非常に時間" #~ "がかかってしまいます。" #~ msgid "" -#~ "Get the latest version of Subversion from http://" -#~ "subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." #~ msgstr "" -#~ "Subversion の最新版を http://subversion.tigris.org/" +#~ "Git の最新版を http://Git.tigris.org/" #~ "servlets/ProjectDocumentList?folderID=91 から取得して" #~ "ください。" #~ msgid "" @@ -14302,21 +14302,21 @@ msgstr "翻訳" #~ msgid "Cyrus SASL Support" #~ msgstr "Cyrus SASL サポート" #~ msgid "" -#~ "Starting with Subversion 1.5.0, svnserve and TortoiseGit support Cyrus " +#~ "Starting with Git 1.5.0, svnserve and TortoiseGit support Cyrus " #~ "SASL (Simple Authentication and Security Layer) for the svn:// protocol. You can find further information in this subversion " +#~ "literal> protocol. You can find further information in this Git " #~ "app note: Using Cyrus SASL Authentication with SubversionUsing Cyrus SASL Authentication with Git." #~ msgstr "" -#~ "Subversion 1.5.0 から、svnserve や TortoiseGit は svn://svn:// プロトコルに対して、Cyrus SASL (Simple Authentication and " -#~ "Security Layer) をサポートします。さらなる情報は、subversion app note: " +#~ "Security Layer) をサポートします。さらなる情報は、Git app note: " #~ "Using Cyrus SASL Authentication with SubversionUsing Cyrus SASL Authentication with Git をご覧ください。" #~ msgid "" -#~ "To avoid such problems, Subversion clients version 1.5 and higher support " +#~ "To avoid such problems, Git clients version 1.5 and higher support " #~ "relative external URLs. The format of those URLs is as follows: \n" #~ "../\trelative to the parent directory of the external\n" #~ "^/\trelative to the repository root\n" @@ -14324,7 +14324,7 @@ msgstr "翻訳" #~ "/\trelative to the server's hostname\n" #~ "" #~ msgstr "" -#~ "このような問題を避けるため、Subversion クライアントバージョン 1.5 以降で" +#~ "このような問題を避けるため、Git クライアントバージョン 1.5 以降で" #~ "は、相対外部参照 URL をサポートします。この URL のフォーマットは以下のよう" #~ "になります。\n" #~ "../\t外部参照の親ディレクトリへの相対パス\n" @@ -14363,7 +14363,7 @@ msgstr "翻訳" #~ "釈されます。" #~ msgid "" #~ "Note that if you change the URL in an svn:externals " -#~ "property, then next time you update your working copy Subversion will " +#~ "property, then next time you update your working copy Git will " #~ "delete the old external folder and make a fresh checkout, so you will see " #~ "files being Added, rather than being " #~ "Updated as you might have expected. This situation " @@ -14372,7 +14372,7 @@ msgstr "翻訳" #~ "to point to the new tag." #~ msgstr "" #~ "svn:externals 属性内の URL を変更すると、次に作業コピー" -#~ "を更新したときに Subversion は古い外部参照フォルダを削除し、新しいものを" +#~ "を更新したときに Git は古い外部参照フォルダを削除し、新しいものを" #~ "チェックアウトします。そのため 更新した ファイルを期" #~ "待していたとしても、追加した ファイルを見ることになり" #~ "ます。この状況は他のプロジェクトからタグを参照した場合に起こり得ます。その" @@ -14411,14 +14411,14 @@ msgstr "翻訳" #~ "このダイアログでは、プロジェクトをインポートするリポジトリの URL を入力す" #~ "る必要があります。" #~ msgid "" -#~ "The Subversion import command has limited functionality - you cannot " +#~ "The Git import command has limited functionality - you cannot " #~ "easily pick items for import. Also, the folder you are importing does not " -#~ "become a Subversion working copy - you have to do a separate checkout. " +#~ "become a Git working copy - you have to do a separate checkout. " #~ "But don't worry, there is another way of working which overcomes both " #~ "these shortcomings :-)" #~ msgstr "" -#~ "Subversion の import コマンドには機能制限があります。インポートする項目を" -#~ "簡単に選択できないのです。また、インポートするフォルダは Subversion の作業" +#~ "Git の import コマンドには機能制限があります。インポートする項目を" +#~ "簡単に選択できないのです。また、インポートするフォルダは Git の作業" #~ "コピーになりません。別にチェックアウトする必要があります。でもご心配なく。" #~ "どちらの欠点も克服する、別の方法があります :-)" #~ msgid "" @@ -14436,11 +14436,11 @@ msgstr "翻訳" #~ msgid "" #~ "If you really need to access a repository through a network share, create " #~ "the repository with FSFS format. If you need to provide server access as " -#~ "well, you will need Subversion Server 1.1 or higher." +#~ "well, you will need Git Server 1.1 or higher." #~ msgstr "" #~ "本当にネットワーク共有越しのリポジトリへのアクセスが必要なら、FSFS フォー" #~ "マットでリポジトリを作成してください。サーバへのアクセスを提供するなら、" -#~ "Subversion サーバ 1.1 以降が必要です。" +#~ "Git サーバ 1.1 以降が必要です。" #~ msgid "" #~ "Brings up the branch/tag dialog. The is the working copy " #~ "to branch/tag from." @@ -14509,7 +14509,7 @@ msgstr "翻訳" #~ msgid "" #~ "When you checkout an existing source tree from the repository, you should " #~ "do so in an empty directory. If you try to check out your source tree " -#~ "into the same directory that you imported from, Subversion will throw an " +#~ "into the same directory that you imported from, Git will throw an " #~ "error message because it will not overwrite the existing unversioned " #~ "files with versioned ones, even if they are identical. You will have to " #~ "check out into a different directory or delete the existing source tree " @@ -14519,7 +14519,7 @@ msgstr "翻訳" #~ "リポジトリから既存のソースツリーをチェックアウトする際は、空のディレクトリ" #~ "にチェックアウトするべきです。インポートしたディレクトリと同じ場所にチェッ" #~ "クアウトしようとすると、バージョン管理外のファイルがバージョン管理下のファ" -#~ "イルと同じであっても上書きしないので、Subversion はエラーメッセージを表示" +#~ "イルと同じであっても上書きしないので、Git はエラーメッセージを表示" #~ "します。別の場所にチェックアウトするか、既存ソースツリーを削除する必要があ" #~ "ります。 で、この問題を避ける" #~ "よりよい方法を説明しています。" @@ -14770,7 +14770,7 @@ msgstr "翻訳" #~ msgid "" #~ "In the From Revision field enter the start revision " #~ "number. This is the revision before the changes you " -#~ "want to merge. Remember that Subversion will create a diff file in order " +#~ "want to merge. Remember that Git will create a diff file in order " #~ "to perform the merge, so the start point has to be just before the first " #~ "change you are interested in. For example, your log messages may look " #~ "something like this: \n" @@ -14792,7 +14792,7 @@ msgstr "翻訳" #~ msgstr "" #~ "元リビジョン フィールドに開始するリビジョン番号を入力" #~ "してください。ここにはマージしたい変更のある前のリビ" -#~ "ジョンを指定します。Subversion はマージする順番で差分ファイルを作成するこ" +#~ "ジョンを指定します。Git はマージする順番で差分ファイルを作成するこ" #~ "とを覚えて置いてください。そのため始点は注目する変更点の前となります。たと" #~ "えば、以下のようなログメッセージがあるとします。\n" #~ "Rev Comments\n" @@ -14918,13 +14918,13 @@ msgstr "翻訳" #~ msgid "Look and Feel Settings" #~ msgstr "外観設定" #~ msgid "" -#~ "Download the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?" +#~ "Download the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?" #~ "folderID=91." #~ msgstr "" -#~ "Subversion の最新版を http://subversion.tigris.org/" +#~ "Git の最新版を http://Git.tigris.org/" #~ "servlets/ProjectDocumentList?folderID=91 からダウン" #~ "ロードしてください。" diff --git a/doc/po/TortoiseSVN_nl.po b/doc/po/TortoiseSVN_nl.po index a7485ca..216bece 100644 --- a/doc/po/TortoiseSVN_nl.po +++ b/doc/po/TortoiseSVN_nl.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: \n" "PO-Revision-Date: 2008-09-10 10:50+0200\n" "Last-Translator: Bob Hulst \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -34,8 +34,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Een Subversion client voor Windows" +msgid "A Git client for Windows" +msgstr "Een Git client voor Windows" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -116,7 +116,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." msgstr "" #. (title) @@ -137,17 +137,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." msgstr "" #. (para) @@ -172,7 +172,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." msgstr "" #. (title) @@ -198,7 +198,7 @@ msgstr "Gemeenschap" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." msgstr "" #. (title) @@ -249,12 +249,12 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:216 #, fuzzy -msgid "The Subversion Book" +msgid "The Git Book" msgstr "Bezig met toevoegen van boek %s" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" +msgid "for the great introduction to Git and its chapter 2 which we copied here" msgstr "" #. (term) @@ -371,12 +371,12 @@ msgstr "Vertaling is on&zeker" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." msgstr "" #. (title) @@ -386,17 +386,17 @@ msgstr "TortoiseGit's Historie" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." msgstr "" #. (title) @@ -406,7 +406,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." msgstr "" #. (term) @@ -448,17 +448,17 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" +msgid "Easy access to Git commands" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" msgstr "" #. (term) @@ -469,7 +469,7 @@ msgstr "Kies map" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." msgstr "" #. (term) @@ -499,7 +499,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." msgstr "" #. (term) @@ -510,7 +510,7 @@ msgstr "BMP: kon gegevens niet wegschrijven" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." msgstr "" #. (term) @@ -520,7 +520,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." msgstr "" #. (term) @@ -530,7 +530,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." msgstr "" #. (title) @@ -679,22 +679,22 @@ msgstr "" #. (primary) #: ../source/TortoiseGit_en.xml:724 #, fuzzy -msgid "Subversion book" +msgid "Git book" msgstr "Bezig met toevoegen van boek %s" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." msgstr "" #. (title) @@ -715,7 +715,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." msgstr "" #. (title) @@ -725,7 +725,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." msgstr "" #. (para) @@ -802,7 +802,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." msgstr "" #. (para) @@ -845,18 +845,18 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" +msgid "What does Git Do?" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:989 #, fuzzy -msgid "Subversion in Action" +msgid "Git in Action" msgstr "Zoek in commentaren" #. (title) @@ -872,27 +872,27 @@ msgstr "Kopiëren van bestand '%s' naar '%s' mislukt" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." msgstr "" #. (para) @@ -917,12 +917,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1058 -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." +msgid "To publish your changes to others, you can use Git's commit command." msgstr "" #. (para) @@ -932,17 +932,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." msgstr "" #. (title) @@ -952,7 +952,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" msgstr "" #. (title) @@ -991,7 +991,7 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." +msgid "Access via WebDAV protocol to Git-aware Apache server." msgstr "" #. (literal) @@ -1037,7 +1037,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." msgstr "" #. (para) @@ -1092,7 +1092,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." msgstr "" #. (para) @@ -1113,7 +1113,7 @@ msgstr "Regel&nummers tonen" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" msgstr "" #. (para) @@ -1163,7 +1163,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." msgstr "" #. (title) @@ -1173,7 +1173,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" msgstr "" #. (para) @@ -1188,7 +1188,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" msgstr "" #. (term) @@ -1229,7 +1229,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." msgstr "" #. (title) @@ -1240,7 +1240,7 @@ msgstr "Samenvatting van bijwerken" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" msgstr "" #. (para) @@ -1250,12 +1250,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." msgstr "" #. (title) @@ -1266,12 +1266,12 @@ msgstr "Registratie van DDE-server '%s' mislukt" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." msgstr "" #. (para) @@ -1297,7 +1297,7 @@ msgstr "Apache" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" msgstr "" #. (primary) @@ -1309,7 +1309,7 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." msgstr "" #. (term) @@ -1319,7 +1319,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." msgstr "" #. (term) @@ -1401,17 +1401,17 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Installatie van Subversion" +msgid "Installing Git" +msgstr "Installatie van Git" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." msgstr "" #. (primary) @@ -1423,12 +1423,12 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." msgstr "" #. (para) @@ -1466,12 +1466,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" #. (para) @@ -1491,12 +1491,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " msgstr "" #. (primary) @@ -1535,17 +1535,17 @@ msgstr "http://MyServer/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " +msgid "means that the Git repositories are available from the URL " msgstr "" #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." msgstr "" #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." msgstr "" #. (filename) @@ -1555,7 +1555,7 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " +msgid "tells Git to look for repositories below " msgstr "" #. (entry) @@ -1580,7 +1580,7 @@ msgstr "" #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" +msgid "Location of the Access file for paths inside a Git repository" msgstr "" #. (entry) @@ -1605,7 +1605,7 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" #. (para) @@ -1644,12 +1644,12 @@ msgstr "Help Index" #. (para) #: ../source/TortoiseGit_en.xml:1956 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1970 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." msgstr "" #. (title) @@ -1665,7 +1665,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1985 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." msgstr "" #. (para) @@ -1771,7 +1771,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2094 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1803,7 +1803,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2141 -msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." msgstr "" #. (para) @@ -1813,7 +1813,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2151 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." msgstr "" #. (para) @@ -1823,7 +1823,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2167 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." msgstr "" #. (title) @@ -1839,7 +1839,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2185 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." msgstr "" #. (para) @@ -1865,7 +1865,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1965,12 +1965,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2340 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2354 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." msgstr "" #. (para) @@ -2001,7 +2001,7 @@ msgstr "Toegang naar beveiligd bestand mislukt." #. (para) #: ../source/TortoiseGit_en.xml:2396 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." msgstr "" #. (para) @@ -2013,7 +2013,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2033,7 +2033,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2425 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." msgstr "" #. (para) @@ -2044,7 +2044,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2441 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" @@ -2063,10 +2063,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2086,7 +2086,7 @@ msgstr "Registratie van DDE-server '%s' mislukt" #. (para) #: ../source/TortoiseGit_en.xml:2486 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." msgstr "" #. (para) @@ -2101,22 +2101,22 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2503 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2517 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2523 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2529 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" msgstr "" #. (title) @@ -2174,7 +2174,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2625 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." msgstr "" #. (para) @@ -2182,15 +2182,15 @@ msgstr "" msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" @@ -2204,7 +2204,7 @@ msgstr "" msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" #. (para) @@ -2266,7 +2266,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2756 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" msgstr "" #. (title) @@ -2287,12 +2287,12 @@ msgstr "Vertaling is on&zeker" #. (para) #: ../source/TortoiseGit_en.xml:2780 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2788 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." msgstr "" #. (title) @@ -2310,12 +2310,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2811 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2816 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." msgstr "" #. (para) @@ -2390,7 +2390,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2916 -msgid "Further information about svnserve can be found in the Version Control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." msgstr "" #. (title) @@ -2401,7 +2401,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2925 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." @@ -2409,12 +2409,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2947 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2952 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." +msgid "If you haven't created a Git repository yet, it's time to do that now." msgstr "" #. (title) @@ -2431,7 +2431,7 @@ msgstr "Maak map" #. (para) #: ../source/TortoiseGit_en.xml:2964 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." msgstr "" #. (title) @@ -2543,7 +2543,7 @@ msgstr "Zoekpaden" #. (para) #: ../source/TortoiseGit_en.xml:3095 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." msgstr "" #. (para) @@ -2583,7 +2583,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3142 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." msgstr "" #. (para) @@ -2670,7 +2670,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3221 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." msgstr "" #. (para) @@ -2747,7 +2747,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3333 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." msgstr "" #. (title) @@ -2774,7 +2774,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3358 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." msgstr "" #. (para) @@ -2821,7 +2821,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3413 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." msgstr "" #. (para) @@ -2865,17 +2865,17 @@ msgstr "(Gebruik standaardtaal)" #. (para) #: ../source/TortoiseGit_en.xml:3452 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3460 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3467 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." msgstr "" #. (para) @@ -2890,12 +2890,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3489 -msgid "You should know the basics of Subversion." +msgid "You should know the basics of Git." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should have set up a server and/or have access to a Subversion repository." +msgid "You should have set up a server and/or have access to a Git repository." msgstr "" #. (para) @@ -3094,12 +3094,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3645 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3676 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." msgstr "" #. (para) @@ -3178,7 +3178,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3731 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "" #. (para) @@ -3298,7 +3298,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3911 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." msgstr "" #. (title) @@ -3327,11 +3327,11 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3935 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" #. (para) @@ -3360,7 +3360,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4011 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." msgstr "" #. (term) @@ -3582,7 +3582,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4293 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." msgstr "" #. (title) @@ -3592,7 +3592,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4304 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." msgstr "" #. (title) @@ -3739,7 +3739,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4490 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." msgstr "" #. (para) @@ -3763,7 +3763,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4518 #: ../source/TortoiseGit_en.xml:5319 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #. (title) @@ -3776,7 +3776,7 @@ msgstr "Verander taal voor gebruikersinterface" #. (para) #: ../source/TortoiseGit_en.xml:4534 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "" #. (title) @@ -4058,7 +4058,7 @@ msgstr "Bestandsnaam bestaat al." #. (para) #: ../source/TortoiseGit_en.xml:4863 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." msgstr "" #. (para) @@ -4108,19 +4108,19 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4942 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4897 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" #. (para) @@ -4135,7 +4135,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4976 -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." msgstr "" #. (para) @@ -4189,12 +4189,12 @@ msgstr "Pictogrammen Schikken" #. (para) #: ../source/TortoiseGit_en.xml:5028 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5036 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." msgstr "" #. (para) @@ -4209,12 +4209,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5054 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5061 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." msgstr "" #. (para) @@ -4249,7 +4249,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5106 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." msgstr "" #. (title) @@ -4695,7 +4695,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5724 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." msgstr "" #. (para) @@ -4782,7 +4782,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5825 -msgid "View the Subversion properties for the selected item." +msgid "View the Git properties for the selected item." msgstr "" #. (para) @@ -4807,17 +4807,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5847 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5856 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5862 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "" #. (para) @@ -4853,7 +4853,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5917 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." msgstr "" #. (para) @@ -4894,7 +4894,7 @@ msgstr "Wis de loggegevens" #. (para) #: ../source/TortoiseGit_en.xml:5951 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." msgstr "" #. (title) @@ -4930,7 +4930,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5992 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." msgstr "" #. (para) @@ -4940,7 +4940,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6011 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." msgstr "" #. (title) @@ -5202,7 +5202,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6324 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." msgstr "" #. (term) @@ -5608,7 +5608,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6768 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." msgstr "" #. (para) @@ -5691,7 +5691,7 @@ msgstr "&Gekleurde vertalingenlijst" #. (para) #: ../source/TortoiseGit_en.xml:6888 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." msgstr "" #. (title) @@ -5702,7 +5702,7 @@ msgstr "Toon alle items in de index" #. (para) #: ../source/TortoiseGit_en.xml:6902 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "" #. (title) @@ -5752,12 +5752,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6917 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6957 -msgid "Subversion uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." +msgid "Git uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." msgstr "" #. (para) @@ -5767,12 +5767,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6970 -msgid "Subversion uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." +msgid "Git uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6977 -msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Subversion compares them with the ignore pattern." +msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Git compares them with the ignore pattern." msgstr "" #. (para) @@ -5802,7 +5802,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7012 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " msgstr "" #. (title) @@ -5824,7 +5824,7 @@ msgstr "kan bestand '%s' niet verwijderen" #. (para) #: ../source/TortoiseGit_en.xml:7029 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "" #. (para) @@ -5834,7 +5834,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7053 -msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." msgstr "" #. (para) @@ -5844,12 +5844,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7081 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7095 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." msgstr "" #. (title) @@ -5946,12 +5946,12 @@ msgstr "Hoofdletter-gevoelig" #. (para) #: ../source/TortoiseGit_en.xml:7224 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7230 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" msgstr "" #. (para) @@ -6005,7 +6005,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7286 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." msgstr "" #. (para) @@ -6036,12 +6036,12 @@ msgstr "Fout bij openen van bestand %s!" #. (para) #: ../source/TortoiseGit_en.xml:7318 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7326 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #. (title) @@ -6052,7 +6052,7 @@ msgstr "Toon verborgen bestanden" #. (para) #: ../source/TortoiseGit_en.xml:7341 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." msgstr "" #. (para) @@ -6151,12 +6151,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7443 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7454 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." msgstr "" #. (title) @@ -6167,7 +6167,7 @@ msgstr "(Gebruik standaardtaal)" #. (para) #: ../source/TortoiseGit_en.xml:7466 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." msgstr "" #. (title) @@ -6183,38 +6183,38 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:7482 -msgid "Explorer property page, Subversion tab" +msgid "Explorer property page, Git tab" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7480 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:7502 -msgid "Subversion Properties" +msgid "Git Properties" msgstr "" #. (primary) #: ../source/TortoiseGit_en.xml:7504 -msgid "Subversion properties" +msgid "Git properties" msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:7510 #, fuzzy -msgid "Subversion property page" +msgid "Git property page" msgstr "Deze pagina afdrukken" #. (para) #: ../source/TortoiseGit_en.xml:7508 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7525 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." msgstr "" #. (title) @@ -6262,17 +6262,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7539 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7590 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7600 -msgid "For more information about properties in Subversion see the Special Properties." +msgid "For more information about properties in Git see the Special Properties." msgstr "" #. (title) @@ -6380,12 +6380,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7718 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7723 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." msgstr "" #. (para) @@ -6410,7 +6410,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7760 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." msgstr "" #. (title) @@ -6421,7 +6421,7 @@ msgstr "Windows 3.1 met Win32s" #. (para) #: ../source/TortoiseGit_en.xml:7767 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." msgstr "" #. (title) @@ -6463,7 +6463,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7832 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." msgstr "" #. (para) @@ -6550,7 +6550,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7965 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." msgstr "" #. (title) @@ -6582,7 +6582,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8008 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." msgstr "" #. (title) @@ -6726,7 +6726,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8195 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " msgstr "" #. (title) @@ -6753,7 +6753,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8249 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." msgstr "" #. (para) @@ -6783,7 +6783,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8292 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." msgstr "" #. (term) @@ -6795,12 +6795,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8303 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8312 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "" #. (para) @@ -6815,12 +6815,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8332 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8340 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." msgstr "" #. (title) @@ -6866,7 +6866,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8411 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." msgstr "" #. (para) @@ -6962,7 +6962,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8521 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" msgstr "" #. (para) @@ -6997,12 +6997,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8582 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8596 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "" #. (para) @@ -7017,7 +7017,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8618 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." msgstr "" #. (title) @@ -7052,7 +7052,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8632 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " msgstr "" #. (para) @@ -7062,7 +7062,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8672 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." msgstr "" #. (title) @@ -7173,17 +7173,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8793 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8817 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:8824 -msgid "How Locking Works in Subversion" +msgid "How Locking Works in Git" msgstr "" #. (para) @@ -7198,7 +7198,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8838 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." msgstr "" #. (para) @@ -7208,7 +7208,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8860 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." msgstr "" #. (para) @@ -7282,7 +7282,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8961 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." msgstr "" #. (title) @@ -7297,7 +7297,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8984 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." msgstr "" #. (title) @@ -7307,7 +7307,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8994 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." msgstr "" #. (para) @@ -7994,7 +7994,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9840 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." msgstr "" #. (para) @@ -8009,7 +8009,7 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:9869 -msgid "Exporting a Subversion Working Copy" +msgid "Exporting a Git Working Copy" msgstr "" #. (primary) @@ -8067,7 +8067,7 @@ msgstr "Toon verborgen bestanden" #. (para) #: ../source/TortoiseGit_en.xml:9944 -msgid "The export dialog does not allow exporting single files, even though Subversion can." +msgid "The export dialog does not allow exporting single files, even though Git can." msgstr "" #. (para) @@ -8163,7 +8163,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10038 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." msgstr "" #. (para) @@ -8208,7 +8208,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10078 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." msgstr "" #. (para) @@ -8384,7 +8384,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10383 -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification." msgstr "" #. (title) @@ -8435,7 +8435,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10441 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." msgstr "" #. (para) @@ -8491,7 +8491,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10554 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." msgstr "" #. (term) @@ -8565,12 +8565,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10636 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10642 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." msgstr "" #. (para) @@ -8591,12 +8591,12 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:10678 #, fuzzy -msgid "Subversion configuration file" +msgid "Git configuration file" msgstr "kan bestand met gebruikersinstellingen '%s' niet wissen" #. (para) #: ../source/TortoiseGit_en.xml:10680 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." msgstr "" #. (term) @@ -8606,12 +8606,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10707 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10714 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." msgstr "" #. (para) @@ -8715,7 +8715,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10837 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." msgstr "" #. (term) @@ -9101,12 +9101,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11251 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11256 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." msgstr "" #. (para) @@ -9201,7 +9201,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11358 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." msgstr "" #. (para) @@ -9231,7 +9231,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11403 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." msgstr "" #. (title) @@ -9317,7 +9317,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11519 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." msgstr "" #. (para) @@ -9488,7 +9488,7 @@ msgstr "BMP: kon gegevens niet wegschrijven" #. (para) #: ../source/TortoiseGit_en.xml:11752 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" msgstr "" #. (para) @@ -9737,7 +9737,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11993 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." msgstr "" #. (para) @@ -9820,7 +9820,7 @@ msgstr "Samenvatting van bijwerken" #. (para) #: ../source/TortoiseGit_en.xml:12064 -msgid "Called before the actual Subversion update begins." +msgid "Called before the actual Git update begins." msgstr "" #. (term) @@ -9931,7 +9931,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12236 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." msgstr "" #. (para) @@ -10024,7 +10024,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12329 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." msgstr "" #. (term) @@ -10082,7 +10082,7 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:12405 #, fuzzy -msgid "Subversion Working Folders" +msgid "Git Working Folders" msgstr "Verkrijgen van de werk map mislukt" #. (primary) @@ -10097,7 +10097,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12412 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." msgstr "" #. (para) @@ -10107,7 +10107,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12423 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." msgstr "" #. (para) @@ -10165,7 +10165,7 @@ msgstr "Bron bestanden moeten zelfde versie nummer hebben!" #. (para) #: ../source/TortoiseGit_en.xml:12484 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." msgstr "" #. (title) @@ -10176,7 +10176,7 @@ msgstr "Regel&nummers tonen" #. (para) #: ../source/TortoiseGit_en.xml:12499 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." msgstr "" #. (para) @@ -10617,7 +10617,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12823 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " msgstr "" #. (programlisting) @@ -10701,7 +10701,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12952 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." msgstr "" #. (para) @@ -10711,7 +10711,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12974 -msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." msgstr "" #. (title) @@ -10774,7 +10774,7 @@ msgstr "Toon deze help boodschap" #. (para) #: ../source/TortoiseGit_en.xml:13050 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." msgstr "" #. (title) @@ -10794,7 +10794,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13072 -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." msgstr "" #. (title) @@ -10946,7 +10946,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13273 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." msgstr "" #. (title) @@ -11014,7 +11014,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13367 -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." msgstr "" #. (para) @@ -11029,7 +11029,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13395 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" msgstr "" #. (para) @@ -11615,7 +11615,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13902 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." msgstr "" #. (title) @@ -12222,17 +12222,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14492 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14501 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14507 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." msgstr "" #. (title) @@ -12291,7 +12291,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14565 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." msgstr "" #. (para) @@ -12326,7 +12326,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14600 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." msgstr "" #. (screen) @@ -12345,7 +12345,7 @@ msgstr "Pad naar database:" #. (para) #: ../source/TortoiseGit_en.xml:14610 #: ../source/TortoiseGit_en.xml:14698 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." msgstr "" #. (para) @@ -12365,7 +12365,7 @@ msgstr "Pad naar database:" #. (para) #: ../source/TortoiseGit_en.xml:14625 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." msgstr "" #. (screen) @@ -12528,7 +12528,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14778 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." msgstr "" #. (screen) @@ -12662,7 +12662,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14880 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." msgstr "" #. (para) @@ -12762,7 +12762,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14968 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." msgstr "" #. (title) @@ -12783,7 +12783,7 @@ msgstr "Kan thread-prioriteit niet instellen" #. (para) #: ../source/TortoiseGit_en.xml:14997 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." msgstr "" #. (para) @@ -12808,12 +12808,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15039 -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15048 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." msgstr "" #. (para) @@ -12833,12 +12833,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15083 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15090 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "" #. (para) @@ -12883,22 +12883,22 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15160 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15170 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15175 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15181 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" msgstr "" #. (title) @@ -12916,7 +12916,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15202 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." msgstr "" #. (para) @@ -13053,7 +13053,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15365 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "" #. (para) @@ -13154,7 +13154,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15511 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "" #. (glossterm) @@ -13190,22 +13190,22 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15553 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15568 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15577 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15594 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "" #. (glossterm) @@ -13215,7 +13215,7 @@ msgstr "Conflict" #. (para) #: ../source/TortoiseGit_en.xml:15604 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "" #. (glossterm) @@ -13225,7 +13225,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15616 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "" #. (para) @@ -13250,7 +13250,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15659 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "" #. (para) @@ -13271,7 +13271,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15684 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "" #. (para) @@ -13317,7 +13317,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15737 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "" #. (glossterm) @@ -13327,7 +13327,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15752 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "" #. (para) @@ -13357,7 +13357,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15807 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "" #. (glossterm) @@ -13392,12 +13392,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15848 -msgid "A frequently-used abbreviation for Subversion." +msgid "A frequently-used abbreviation for Git." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15851 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "" #. (para) @@ -13407,7 +13407,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15874 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "" #. (glossterm) diff --git a/doc/po/TortoiseSVN_ru.po b/doc/po/TortoiseSVN_ru.po index 5fa6401..bd92f57 100644 --- a/doc/po/TortoiseSVN_ru.po +++ b/doc/po/TortoiseSVN_ru.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2008-12-21 00:08 +0000\n" "PO-Revision-Date: 2009-01-08 14:18+0300\n" "Last-Translator: Stanislav Petrakov \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -34,8 +34,8 @@ msgid "@@image: 'images/svn_move.png'; md5=THIS FILE DOESN'T EXIST" msgstr "@@image: 'images/svn_move.png'; md5=ЭТОТ ФАЙЛ НЕ СУЩЕСТВУЕТ" # ### Словарь ### -# Subversion - система управления версиями, т.е. женского рода (Подверсия :) -# TortoiseGit - мужского рода, поскольку это клиент Subversion (Черепах :) +# Git - система управления версиями, т.е. женского рода (Подверсия :) +# TortoiseGit - мужского рода, поскольку это клиент Git (Черепах :) # ############### # authentication -- аутентификация (установление личности) # authorization -- авторизация (санкционирование доступа) @@ -96,8 +96,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Клиент Subversion для Windows" +msgid "A Git client for Windows" +msgstr "Клиент Git для Windows" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -177,8 +177,8 @@ msgstr "Кому адресована эта книга" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "Эта книга написана для тех, кто, владея компьютерной грамотой, хочет использовать Subversion для управления своими данными, но чувствует себя неуютно, применяя для этого клиента командной строки. Поскольку TortoiseGit - расширение оболочки Windows, предполагается, что пользователь знаком с Проводником Windows и знает, как его использовать." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "Эта книга написана для тех, кто, владея компьютерной грамотой, хочет использовать Git для управления своими данными, но чувствует себя неуютно, применяя для этого клиента командной строки. Поскольку TortoiseGit - расширение оболочки Windows, предполагается, что пользователь знаком с Проводником Windows и знает, как его использовать." #. (title) #: ../source/TortoiseGit_en.xml:84 @@ -198,18 +198,18 @@ msgstr " рассказывает, что #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." -msgstr "В главе мы даём краткое введение в систему управления версиями Subversion, лежащую в основе TortoiseGit. Оно позаимствовано из документации проекта Subversion и объясняет различные подходы к управлению версиями, и то, как работает Subversion." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." +msgstr "В главе мы даём краткое введение в систему управления версиями Git, лежащую в основе TortoiseGit. Оно позаимствовано из документации проекта Git и объясняет различные подходы к управлению версиями, и то, как работает Git." #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." -msgstr "Большинство пользователей Subversion никогда не столкнётся с необходимостью устанавливать сервер самостоятельно, поэтому следующая глава, объясняющая как установить и настроить сервер, в основном будет полезна администраторам." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgstr "Большинство пользователей Git никогда не столкнётся с необходимостью устанавливать сервер самостоятельно, поэтому следующая глава, объясняющая как установить и настроить сервер, в основном будет полезна администраторам." #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr "В главе о рассказывается о том, как создать локальное хранилище, полезное для проверки Subversion и TortoiseGit в рамках одного компьютера. В ней также немного рассказывается об администрировании хранилища, что также относится и к хранилищам, расположенным на сервере." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr "В главе о рассказывается о том, как создать локальное хранилище, полезное для проверки Git и TortoiseGit в рамках одного компьютера. В ней также немного рассказывается об администрировании хранилища, что также относится и к хранилищам, расположенным на сервере." #. (para) #: ../source/TortoiseGit_en.xml:113 @@ -233,8 +233,8 @@ msgstr "Раздел показывает, #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." -msgstr " показывает, как соотносятся команды TortoiseGit и их эквиваленты в клиенте командной строки Subversion svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." +msgstr " показывает, как соотносятся команды TortoiseGit и их эквиваленты в клиенте командной строки Git svn.exe." #. (title) #: ../source/TortoiseGit_en.xml:144 @@ -258,8 +258,8 @@ msgstr "Сообщество" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "Обе программы: и TortoiseGit, и Subversion, разработаны сообществом людей, участвующих в этих проектах. Эти люди находятся в разных странах по всему миру, и они объединились для создания замечательных программ." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "Обе программы: и TortoiseGit, и Git, разработаны сообществом людей, участвующих в этих проектах. Эти люди находятся в разных странах по всему миру, и они объединились для создания замечательных программ." #. (title) #: ../source/TortoiseGit_en.xml:180 @@ -308,13 +308,13 @@ msgstr "за работу над документацией и отлов оши #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "Книге о Subversion (The Subversion Book)" +msgid "The Git Book" +msgstr "Книге о Git (The Git Book)" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "за прекрасное введение в Subversion и главу 2, которую мы сюда скопировали" +msgid "for the great introduction to Git and its chapter 2 which we copied here" +msgstr "за прекрасное введение в Git и главу 2, которую мы сюда скопировали" #. (term) #: ../source/TortoiseGit_en.xml:225 @@ -427,13 +427,13 @@ msgstr "Что такое TortoiseGit?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." -msgstr "TortoiseGit - это бесплатный, с открытыми исходными кодами клиент системы управления версиями Subversion. Это означает, что TortoiseGit управляет файлами и папками во времени. Файлы хранятся в центральном хранилище, которое очень похоже на обычный файловый сервер, за исключением того, что в нём запоминается каждое изменение, сделанное в ваших файлах и папках. Это позволяет восстанавливать старые версии файлов, и изучать историю того, как и когда изменялись ваши данные, и кем это делалось. Поэтому многие считают Subversion и системы управления версиями вообще своеобразными машинами времени." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." +msgstr "TortoiseGit - это бесплатный, с открытыми исходными кодами клиент системы управления версиями Git. Это означает, что TortoiseGit управляет файлами и папками во времени. Файлы хранятся в центральном хранилище, которое очень похоже на обычный файловый сервер, за исключением того, что в нём запоминается каждое изменение, сделанное в ваших файлах и папках. Это позволяет восстанавливать старые версии файлов, и изучать историю того, как и когда изменялись ваши данные, и кем это делалось. Поэтому многие считают Git и системы управления версиями вообще своеобразными машинами времени." #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." -msgstr "Некоторые системы контроля версий являются также и системами управления конфигурацией программ (software configuration management - SCM). Такие системы специально созданы для управления деревьями исходного кода, и имеют множество возможностей, специфичных для разработки программ, таких как непосредственное понимание языков программирования, или предоставление инструментов для сборки программ. Однако Subversion не является такой системой, она является системой общего назначения, которая может быть использована для управления любым набором файлов, включая и исходные коды программ." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgstr "Некоторые системы контроля версий являются также и системами управления конфигурацией программ (software configuration management - SCM). Такие системы специально созданы для управления деревьями исходного кода, и имеют множество возможностей, специфичных для разработки программ, таких как непосредственное понимание языков программирования, или предоставление инструментов для сборки программ. Однако Git не является такой системой, она является системой общего назначения, которая может быть использована для управления любым набором файлов, включая и исходные коды программ." #. (title) #: ../source/TortoiseGit_en.xml:368 @@ -442,18 +442,18 @@ msgstr "История TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "В 2002 году Тим Кемп (Tim Kemp) обнаружил, что Subversion - очень хорошая система управления версиями, но ей не хватает хорошего клиента с графическим интерфейсом. Идея реализации клиента Subversion как расширения оболочки Windows была навеяна похожим клиентом для системы CVS, TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "В 2002 году Тим Кемп (Tim Kemp) обнаружил, что Git - очень хорошая система управления версиями, но ей не хватает хорошего клиента с графическим интерфейсом. Идея реализации клиента Git как расширения оболочки Windows была навеяна похожим клиентом для системы CVS, TortoiseCVS." #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Тим изучил исходники TortoiseCVS и взял их за основу для TortoiseGit. Он начал проект, зарегистрировал домен TortoiseGit.org и опубликовал исходный код. В это время Стефан Кунг (Stefan Küng) искал хорошую и бесплатную систему управления версиями, и обнаружил Subversion и исходный код TortoiseGit. Поскольку TortoiseGit всё ещё было невозможно использовать, он присоединился к проекту и начал программировать. Вскоре он переписал большинство существующего кода и начал добавлять команды и новые возможности, пока ничего из первоначального кода не осталось." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Тим изучил исходники TortoiseCVS и взял их за основу для TortoiseGit. Он начал проект, зарегистрировал домен TortoiseGit.org и опубликовал исходный код. В это время Стефан Кунг (Stefan Küng) искал хорошую и бесплатную систему управления версиями, и обнаружил Git и исходный код TortoiseGit. Поскольку TortoiseGit всё ещё было невозможно использовать, он присоединился к проекту и начал программировать. Вскоре он переписал большинство существующего кода и начал добавлять команды и новые возможности, пока ничего из первоначального кода не осталось." #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." -msgstr "Со временем Subversion становилась всё более стабильной и привлекала всё больше и больше пользователей, которые начинали использовать TortoiseGit для доступа к Subversion. Число пользователей быстро росло (и продолжает расти каждый день). Именно тогда Люббе Онкен (Lübbe Onken) предложил помощь в создании некоторых симпатичных значков и логотипа для TortoiseGit. Он также взял на себя заботу о веб-сайте и стал заведовать переводами." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgstr "Со временем Git становилась всё более стабильной и привлекала всё больше и больше пользователей, которые начинали использовать TortoiseGit для доступа к Git. Число пользователей быстро росло (и продолжает расти каждый день). Именно тогда Люббе Онкен (Lübbe Onken) предложил помощь в создании некоторых симпатичных значков и логотипа для TortoiseGit. Он также взял на себя заботу о веб-сайте и стал заведовать переводами." #. (title) #: ../source/TortoiseGit_en.xml:399 @@ -462,8 +462,8 @@ msgstr "Возможности TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." -msgstr "Что делает TortoiseGit таким хорошим клиентом Subversion? Вот краткий список возможностей:" +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." +msgstr "Что делает TortoiseGit таким хорошим клиентом Git? Вот краткий список возможностей:" #. (term) #: ../source/TortoiseGit_en.xml:406 @@ -504,19 +504,19 @@ msgstr "Статус каждого версированного файла и #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Простой доступ к командам Subversion" +msgid "Easy access to Git commands" +msgstr "Простой доступ к командам Git" # !!! СП: тут главная мысль - что добавляет собственное подменю #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." -msgstr "Все команды Subversion доступны из контекстного меню Проводника. TortoiseGit добавляет туда собственное подменю." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgstr "Все команды Git доступны из контекстного меню Проводника. TortoiseGit добавляет туда собственное подменю." #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "Поскольку TortoiseGit является клиентом Subversion, мы хотели бы показать и некоторые из возможностей самой Subversion:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" +msgstr "Поскольку TortoiseGit является клиентом Git, мы хотели бы показать и некоторые из возможностей самой Git:" #. (term) #: ../source/TortoiseGit_en.xml:460 @@ -525,8 +525,8 @@ msgstr "Версирование папок" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS отслеживает только историю отдельных файлов, тогда как Subversion реализует виртуальную версионную файловую систему, которая отслеживает изменения в целых деревьях папок во времени. Файлы и папки являются версированными. В результате, есть команды переместить и копировать, реально выполняемые на стороне клиента и работающие непосредственно с файлами и папками." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS отслеживает только историю отдельных файлов, тогда как Git реализует виртуальную версионную файловую систему, которая отслеживает изменения в целых деревьях папок во времени. Файлы и папки являются версированными. В результате, есть команды переместить и копировать, реально выполняемые на стороне клиента и работающие непосредственно с файлами и папками." #. (term) #: ../source/TortoiseGit_en.xml:475 @@ -555,8 +555,8 @@ msgstr "Возможность выбора сетевого уровня" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "В Subversion есть абстрагируемое понятие доступа к хранилищу, которое упрощает реализацию новых сетевых механизмов. Усовершенствованный сетевой сервер Subversion является модулем для веб-сервера Apache, который использует для взаимодействия диалект HTTP под названием WebDAV/DeltaV. Это даёт Subversion большие преимущества в стабильности и совместимости, и предоставляет различные ключевые возможности без дополнительных затрат: проверка личности (аутентификация), проверка прав доступа (авторизация), сжатие потока данных при передаче, просмотр хранилища. Также доступна меньшая, автономная версия сервера Subversion, взаимодействующая по собственному протоколу, который легко может быть туннелирован через ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "В Git есть абстрагируемое понятие доступа к хранилищу, которое упрощает реализацию новых сетевых механизмов. Усовершенствованный сетевой сервер Git является модулем для веб-сервера Apache, который использует для взаимодействия диалект HTTP под названием WebDAV/DeltaV. Это даёт Git большие преимущества в стабильности и совместимости, и предоставляет различные ключевые возможности без дополнительных затрат: проверка личности (аутентификация), проверка прав доступа (авторизация), сжатие потока данных при передаче, просмотр хранилища. Также доступна меньшая, автономная версия сервера Git, взаимодействующая по собственному протоколу, который легко может быть туннелирован через ssh." #. (term) #: ../source/TortoiseGit_en.xml:516 @@ -565,8 +565,8 @@ msgstr "Единый способ обработки данных" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." -msgstr "Subversion получает различия между файлами при помощи бинарного разностного алгоритма, который работает одинаково как с текстовыми (читаемыми человеком), так и с бинарными (не читаемыми человеком) файлами. Оба типа файлов содержатся в хранилище в сжатом виде, а различия передаются по сети в обоих направлениях." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgstr "Git получает различия между файлами при помощи бинарного разностного алгоритма, который работает одинаково как с текстовыми (читаемыми человеком), так и с бинарными (не читаемыми человеком) файлами. Оба типа файлов содержатся в хранилище в сжатом виде, а различия передаются по сети в обоих направлениях." #. (term) #: ../source/TortoiseGit_en.xml:529 @@ -575,8 +575,8 @@ msgstr "Эффективные ветки и метки" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." -msgstr "Стоимость создания веток и меток не обязательно должна быть пропорциональна размеру проекта. Subversion создаёт ветки и метки, просто копируя проект с использованием механизма, похожего на жёсткие ссылки в файловых системах. Благодаря этому, операции по созданию веток и меток происходят за одинаковое, очень малое время и занимают очень мало места в хранилище. " +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgstr "Стоимость создания веток и меток не обязательно должна быть пропорциональна размеру проекта. Git создаёт ветки и метки, просто копируя проект с использованием механизма, похожего на жёсткие ссылки в файловых системах. Благодаря этому, операции по созданию веток и меток происходят за одинаковое, очень малое время и занимают очень мало места в хранилище. " #. (term) #: ../source/TortoiseGit_en.xml:542 @@ -585,8 +585,8 @@ msgstr "Расширяемость" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Subversion не имеет исторического багажа. Она реализована в виде набора совместно используемых библиотек на языке C с хорошо определёнными API. Это делает Subversion чрезвычайно удобной в сопровождении системой, пригодной для взаимодействия с другими приложениями и языками программирования." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." +msgstr "Git не имеет исторического багажа. Она реализована в виде набора совместно используемых библиотек на языке C с хорошо определёнными API. Это делает Git чрезвычайно удобной в сопровождении системой, пригодной для взаимодействия с другими приложениями и языками программирования." #. (title) #: ../source/TortoiseGit_en.xml:558 @@ -732,23 +732,23 @@ msgstr "Основные понятия" #. (primary) #: ../source/TortoiseGit_en.xml:725 -msgid "Subversion book" -msgstr "книга о Subversion" +msgid "Git book" +msgstr "книга о Git" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." -msgstr "Эта глава - слегка изменённая версия такой же главы из книги о Subversion. Размещённая в Сети версия книги о Subversion доступна по адресу http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." +msgstr "Эта глава - слегка изменённая версия такой же главы из книги о Git. Размещённая в Сети версия книги о Git доступна по адресу http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." -msgstr "Эта глава является кратким неформальным введением в Subversion. Если управление версиями для вас в новинку, эта глава определённо для вас. Мы начнём с обсуждения основных понятий управления версиями, перейдём к определённым идеям, лежащим в основе Subversion, и покажем несколько простых примеров использования Subversion." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." +msgstr "Эта глава является кратким неформальным введением в Git. Если управление версиями для вас в новинку, эта глава определённо для вас. Мы начнём с обсуждения основных понятий управления версиями, перейдём к определённым идеям, лежащим в основе Git, и покажем несколько простых примеров использования Git." #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." -msgstr "Несмотря на то, что примеры этой главы показывают людей, совместно использующих набор исходных кодов программ, помните, что Subversion может управлять набором файлов любого типа, она не ограничена только тем, чтобы помогать в работе одним компьютерным программистам." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." +msgstr "Несмотря на то, что примеры этой главы показывают людей, совместно использующих набор исходных кодов программ, помните, что Git может управлять набором файлов любого типа, она не ограничена только тем, чтобы помогать в работе одним компьютерным программистам." #. (title) #. (title) @@ -768,8 +768,8 @@ msgstr "хранилище" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." -msgstr "Subversion - это централизованная система для совместного использования информации. В её основе лежит хранилище, являющееся центром хранения данных. Хранилище хранит информацию в форме дерева файловой системы - типичной иерархии файлов и папок. Любое количество клиентов подключаются к хранилищу, а затем читают или записывают эти файлы. Записывая данные, клиент делает информацию доступной для остальных; читая данные, клиент получает информацию от других." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgstr "Git - это централизованная система для совместного использования информации. В её основе лежит хранилище, являющееся центром хранения данных. Хранилище хранит информацию в форме дерева файловой системы - типичной иерархии файлов и папок. Любое количество клиентов подключаются к хранилищу, а затем читают или записывают эти файлы. Записывая данные, клиент делает информацию доступной для остальных; читая данные, клиент получает информацию от других." #. (title) #: ../source/TortoiseGit_en.xml:767 @@ -778,8 +778,8 @@ msgstr "Типичная система Клиент/Сервер" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." -msgstr "Почему мы заостряем на этом внимание? Пока это звучит как определение типичного файл-сервера. И действительно, хранилище является разновидностью файл-сервера, однако не совсем обычного. Что делает хранилище Subversion особенным - это то, что он запоминает каждое внесённое изменение, когда-либо записанное в него: любое изменение любого файла, и даже изменения в самом дереве каталогов, такие как добавление, удаление и реорганизация файлов и каталогов." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgstr "Почему мы заостряем на этом внимание? Пока это звучит как определение типичного файл-сервера. И действительно, хранилище является разновидностью файл-сервера, однако не совсем обычного. Что делает хранилище Git особенным - это то, что он запоминает каждое внесённое изменение, когда-либо записанное в него: любое изменение любого файла, и даже изменения в самом дереве каталогов, такие как добавление, удаление и реорганизация файлов и каталогов." #. (para) #: ../source/TortoiseGit_en.xml:780 @@ -852,8 +852,8 @@ msgstr "Модель Копирование-Изменение-Слияние" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." -msgstr "Subversion, CVS и другие системы управления версиями используют модель копирование-изменение-слияние в качестве альтернативы блокированию. В этой модели клиент каждого пользователя считывает из хранилища проект и создаёт персональную рабочую копию - локальное отражение файлов и каталогов хранилища. После этого пользователи работают параллельно, изменяя свои личные копии. В конце концов, личные копии сливаются в новую, финальную версию. Обычно система управления версиями помогает в слиянии, но, разумеется, в конечном итоге за его корректное выполнение всё равно отвечает человек." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgstr "Git, CVS и другие системы управления версиями используют модель копирование-изменение-слияние в качестве альтернативы блокированию. В этой модели клиент каждого пользователя считывает из хранилища проект и создаёт персональную рабочую копию - локальное отражение файлов и каталогов хранилища. После этого пользователи работают параллельно, изменяя свои личные копии. В конце концов, личные копии сливаются в новую, финальную версию. Обычно система управления версиями помогает в слиянии, но, разумеется, в конечном итоге за его корректное выполнение всё равно отвечает человек." #. (para) #: ../source/TortoiseGit_en.xml:907 @@ -894,18 +894,18 @@ msgstr "Однако, есть одна распространённая сит #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" -msgstr "Что же делает Subversion?" +msgid "What does Git Do?" +msgstr "Что же делает Git?" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." -msgstr "По умолчанию Subversion использует модель копирование-изменение-слияние, и в большинстве случаев это всё, что вам нужно. Однако, начиная с версии 1.2, Subversion также поддерживает блокирование файлов, так что если у вас есть необъединяемые файлы, или если руководство просто вынудило вас работать в режиме с блокировками, Subversion сможет предоставить вам такую возможность." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." +msgstr "По умолчанию Git использует модель копирование-изменение-слияние, и в большинстве случаев это всё, что вам нужно. Однако, начиная с версии 1.2, Git также поддерживает блокирование файлов, так что если у вас есть необъединяемые файлы, или если руководство просто вынудило вас работать в режиме с блокировками, Git сможет предоставить вам такую возможность." #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" -msgstr "Subversion в действии" +msgid "Git in Action" +msgstr "Git в действии" #. (title) #: ../source/TortoiseGit_en.xml:991 @@ -919,28 +919,28 @@ msgstr "рабочая копия" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." -msgstr "Вы уже читали о рабочих копиях, сейчас мы покажем, как клиент Subversion их создаёт и использует." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." +msgstr "Вы уже читали о рабочих копиях, сейчас мы покажем, как клиент Git их создаёт и использует." #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." -msgstr "Рабочая копия Subversion - это обычное дерево папок в вашей локальной системе, содержащее набор файлов. Вы можете изменять эти файлы по своему усмотрению, и, если это исходные коды, вы можете скомпилировать программу из них обычным способом. Ваша рабочая копия - это ваша собственная личная рабочая область: Subversion никогда не вносит изменения, сделанные другими, также как и не передаёт другим изменения, сделанные вами, до тех пор, пока вы сами явно не скажете ей сделать это." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgstr "Рабочая копия Git - это обычное дерево папок в вашей локальной системе, содержащее набор файлов. Вы можете изменять эти файлы по своему усмотрению, и, если это исходные коды, вы можете скомпилировать программу из них обычным способом. Ваша рабочая копия - это ваша собственная личная рабочая область: Git никогда не вносит изменения, сделанные другими, также как и не передаёт другим изменения, сделанные вами, до тех пор, пока вы сами явно не скажете ей сделать это." #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." -msgstr "После того, как вы произвели некоторые изменения в файлах вашей рабочей копии и убедились, что они работают правильно, вы можете воспользоваться представленными в Subversion командами для публикации ваших изменений, чтобы сделать их доступными другим людям, работающим вместе с вами над проектом (путём записи в хранилище). Когда другие люди публикуют свои изменения, Subversion предоставляет вам команды для слияния этих изменений с файлами в вашей рабочей папке (путём чтения из хранилища)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgstr "После того, как вы произвели некоторые изменения в файлах вашей рабочей копии и убедились, что они работают правильно, вы можете воспользоваться представленными в Git командами для публикации ваших изменений, чтобы сделать их доступными другим людям, работающим вместе с вами над проектом (путём записи в хранилище). Когда другие люди публикуют свои изменения, Git предоставляет вам команды для слияния этих изменений с файлами в вашей рабочей папке (путём чтения из хранилища)." #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." -msgstr "Рабочая копия также содержит несколько дополнительных файлов, создаваемых и обслуживаемых Subversion, помогающих при выполнении этих команд. В частности, каждая папка в вашей рабочей копии содержит папку с именем .svn, называемую также административной папкой рабочей копии. Файлы в каждой административной папке помогают Subversion распознавать, какие файлы содержат неопубликованные изменения, и какие файлы устарели из-за того, что было сделано другими." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgstr "Рабочая копия также содержит несколько дополнительных файлов, создаваемых и обслуживаемых Git, помогающих при выполнении этих команд. В частности, каждая папка в вашей рабочей копии содержит папку с именем .svn, называемую также административной папкой рабочей копии. Файлы в каждой административной папке помогают Git распознавать, какие файлы содержат неопубликованные изменения, и какие файлы устарели из-за того, что было сделано другими." #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." -msgstr "Типичное хранилище Subversion часто содержит файлы (или исходный код) нескольких проектов, обычно каждый проект - это подпапка в дереве файловой системы хранилища. При таком подходе, пользовательская рабочая копия будет соответствовать какому-то поддереву в хранилище." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgstr "Типичное хранилище Git часто содержит файлы (или исходный код) нескольких проектов, обычно каждый проект - это подпапка в дереве файловой системы хранилища. При таком подходе, пользовательская рабочая копия будет соответствовать какому-то поддереву в хранилище." #. (para) #: ../source/TortoiseGit_en.xml:1038 @@ -964,13 +964,13 @@ msgstr "Для получения рабочей копии, вы должны < #. (para) #: ../source/TortoiseGit_en.xml:1058 -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." -msgstr "Предположим, вы вносите изменения в button.c. Так как в папке .svn запоминается дата модификации файла и исходное содержимое, Subversion может узнать, что вы изменили файл. Однако, Subversion не делает ваши изменения доступными другим, пока вы явно не скажете ей об этом. Действие по опубликованию ваших изменений, обычно известно как фиксация (или внесение) изменений в хранилище." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgstr "Предположим, вы вносите изменения в button.c. Так как в папке .svn запоминается дата модификации файла и исходное содержимое, Git может узнать, что вы изменили файл. Однако, Git не делает ваши изменения доступными другим, пока вы явно не скажете ей об этом. Действие по опубликованию ваших изменений, обычно известно как фиксация (или внесение) изменений в хранилище." #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." -msgstr "Для обнародования ваших изменений, вы должны использовать команду Subversion фиксировать (commit)." +msgid "To publish your changes to others, you can use Git's commit command." +msgstr "Для обнародования ваших изменений, вы должны использовать команду Git фиксировать (commit)." #. (para) #: ../source/TortoiseGit_en.xml:1072 @@ -979,18 +979,18 @@ msgstr "Теперь ваши изменения в button.c/calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." -msgstr "Предположим, вы работаете вместе с Салли, которая извлекла рабочую копию /calc в то же время, что и вы. Когда вы фиксируете ваши изменения в button.c, рабочая копия Салли остаётся неизменной, Subversion изменяет рабочие копии только по запросу пользователя." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." +msgstr "Предположим, вы работаете вместе с Салли, которая извлекла рабочую копию /calc в то же время, что и вы. Когда вы фиксируете ваши изменения в button.c, рабочая копия Салли остаётся неизменной, Git изменяет рабочие копии только по запросу пользователя." #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." -msgstr "Для приведения своего проекта в актуальное состояние, Салли может попросить Subversion обновить её рабочую копию, используя команду обновить (update). В результате, в её рабочую копию будут внесены как ваши изменения, так и изменения других, зафиксированные с момента извлечения Салли своей рабочей копии." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgstr "Для приведения своего проекта в актуальное состояние, Салли может попросить Git обновить её рабочую копию, используя команду обновить (update). В результате, в её рабочую копию будут внесены как ваши изменения, так и изменения других, зафиксированные с момента извлечения Салли своей рабочей копии." #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." -msgstr "Обратите внимание, Салли не надо указывать, какие файлы обновлять, Subversion использует информацию в папке .svn, а затем информацию из хранилища, для определения того, какие файлы нуждаются в обновлении." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgstr "Обратите внимание, Салли не надо указывать, какие файлы обновлять, Git использует информацию в папке .svn, а затем информацию из хранилища, для определения того, какие файлы нуждаются в обновлении." #. (title) #: ../source/TortoiseGit_en.xml:1103 @@ -1000,8 +1000,8 @@ msgstr "Адреса URL хранилища" # !!! интересно, а артикль перед URL не должен быть "an"? #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" -msgstr "Хранилища Subversion могут быть доступны посредством множества различных методов - с локального диска или через различные сетевые протоколы. Описание расположения хранилища, однако, всегда является разновидностью URL. Схема URL показывает метод доступа:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgstr "Хранилища Git могут быть доступны посредством множества различных методов - с локального диска или через различные сетевые протоколы. Описание расположения хранилища, однако, всегда является разновидностью URL. Схема URL показывает метод доступа:" #. (title) #: ../source/TortoiseGit_en.xml:1112 @@ -1037,8 +1037,8 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "Доступ через протокол WebDAV к Subversion, работающем на сервере Apache." +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "Доступ через протокол WebDAV к Git, работающем на сервере Apache." #. (literal) #: ../source/TortoiseGit_en.xml:1141 @@ -1084,8 +1084,8 @@ msgstr "Аутентифицируемый, зашифрованный TCP/IP д #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." -msgstr "В большинстве случаев, для URL в Subversion используется стандартный синтаксис, позволяющий указывать имя сервера и номер порта в URL. Метод доступа file:// обычно используется для локального доступа, хотя он может быть использован с путями UNC для доступа к узлам по сети. В этом случае URL имеет форму file://имя-компьютера/путь/к/хранилищу. Для локальной машины часть имя-компьютера должна быть либо пропущена, либо указана как localhost. По этой причине, локальные пути обычно указывают с тремя косыми чертами (/), file:///путь/к/хранилищу." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgstr "В большинстве случаев, для URL в Git используется стандартный синтаксис, позволяющий указывать имя сервера и номер порта в URL. Метод доступа file:// обычно используется для локального доступа, хотя он может быть использован с путями UNC для доступа к узлам по сети. В этом случае URL имеет форму file://имя-компьютера/путь/к/хранилищу. Для локальной машины часть имя-компьютера должна быть либо пропущена, либо указана как localhost. По этой причине, локальные пути обычно указывают с тремя косыми чертами (/), file:///путь/к/хранилищу." #. (para) #: ../source/TortoiseGit_en.xml:1181 @@ -1144,8 +1144,8 @@ msgstr "Команда svn commit может опублико #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." -msgstr "Каждая фиксация в хранилище обрабатывается как атомарная транзакция: либо сохраняются все изменения, либо не сохраняется ни одно из них. Subversion старается поддерживать эту атомарность, несмотря на сбои программ, аварийные отказы систем, на сетевые проблемы и действия других пользователей." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgstr "Каждая фиксация в хранилище обрабатывается как атомарная транзакция: либо сохраняются все изменения, либо не сохраняется ни одно из них. Git старается поддерживать эту атомарность, несмотря на сбои программ, аварийные отказы систем, на сетевые проблемы и действия других пользователей." #. (para) #: ../source/TortoiseGit_en.xml:1238 @@ -1164,8 +1164,8 @@ msgstr "Общие номера ревизий" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" -msgstr "В отличие от многих других систем управления версиями, номера ревизий в Subversion относятся к деревьям целиком, а не к отдельным файлам. Каждый номер ревизии обозначает целое дерево - некоторое состояние хранилища после зафиксированного изменения. Иначе говоря, можно считать, что ревизия N представляет состояние файловой системы хранилища после выполнения N-ой фиксации. Когда пользователь Subversion говорит о \"ревизии 5 foo.c\", это в действительности означает \"foo.c, каким он был в ревизии 5\". Обратите внимание, что ревизии N и M файла, вообще говоря, не обязательно отличаются!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgstr "В отличие от многих других систем управления версиями, номера ревизий в Git относятся к деревьям целиком, а не к отдельным файлам. Каждый номер ревизии обозначает целое дерево - некоторое состояние хранилища после зафиксированного изменения. Иначе говоря, можно считать, что ревизия N представляет состояние файловой системы хранилища после выполнения N-ой фиксации. Когда пользователь Git говорит о \"ревизии 5 foo.c\", это в действительности означает \"foo.c, каким он был в ревизии 5\". Обратите внимание, что ревизии N и M файла, вообще говоря, не обязательно отличаются!" #. (para) #: ../source/TortoiseGit_en.xml:1276 @@ -1226,8 +1226,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." -msgstr "Изменения, внесенные Салли в integer.c, будут отражены в вашей рабочей копии, также как и ваши изменения будут присутствовать в button.c. В этом примере текст Makefile в ревизиях 4, 5 и 6 идентичен, однако, Subversion всё равно присваивает файлу Makefile в вашей рабочей копии номер ревизии 6, чтобы показать, что файл в актуальном состоянии. Таким образом, после того как вы выполните полное обновление вашей рабочей копии, она будет соответствовать точно одной ревизии в хранилище." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgstr "Изменения, внесенные Салли в integer.c, будут отражены в вашей рабочей копии, также как и ваши изменения будут присутствовать в button.c. В этом примере текст Makefile в ревизиях 4, 5 и 6 идентичен, однако, Git всё равно присваивает файлу Makefile в вашей рабочей копии номер ревизии 6, чтобы показать, что файл в актуальном состоянии. Таким образом, после того как вы выполните полное обновление вашей рабочей копии, она будет соответствовать точно одной ревизии в хранилище." #. (title) #: ../source/TortoiseGit_en.xml:1325 @@ -1236,8 +1236,8 @@ msgstr "Как рабочие копии отслеживают хранилищ #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" -msgstr "В служебной папке .svn/ для каждого файла рабочей папки Subversion записывает информацию о двух важнейших свойствах:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" +msgstr "В служебной папке .svn/ для каждого файла рабочей папки Git записывает информацию о двух важнейших свойствах:" #. (para) #: ../source/TortoiseGit_en.xml:1332 @@ -1251,8 +1251,8 @@ msgstr "дату и время, когда локальная копия пос #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" -msgstr "Основываясь на этой информации, и взаимодействуя с хранилищем, Subversion может сказать, в каком из следующих четырех состояний находится рабочий файл:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" +msgstr "Основываясь на этой информации, и взаимодействуя с хранилищем, Git может сказать, в каком из следующих четырех состояний находится рабочий файл:" #. (term) #: ../source/TortoiseGit_en.xml:1352 @@ -1292,8 +1292,8 @@ msgstr "Изменён локально и устарел" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." -msgstr "Файл был изменён как в рабочей папке, так и в хранилище. Команда фиксировать (commit) потерпит неудачу с ошибкой устарел (out-of-date). Файл необходимо сначала обновить; команда обновить (update) попытается объединить опубликованные изменения с локальными. Если Subversion не сможет выполнить объединение в приемлемой форме самостоятельно, то заботу о разрешении конфликта она оставит пользователю." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgstr "Файл был изменён как в рабочей папке, так и в хранилище. Команда фиксировать (commit) потерпит неудачу с ошибкой устарел (out-of-date). Файл необходимо сначала обновить; команда обновить (update) попытается объединить опубликованные изменения с локальными. Если Git не сможет выполнить объединение в приемлемой форме самостоятельно, то заботу о разрешении конфликта она оставит пользователю." #. (title) #: ../source/TortoiseGit_en.xml:1412 @@ -1302,8 +1302,8 @@ msgstr "Подводя итоги" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "В этой главе мы рассмотрели несколько основных понятий Subversion:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" +msgstr "В этой главе мы рассмотрели несколько основных понятий Git:" #. (para) #: ../source/TortoiseGit_en.xml:1419 @@ -1312,13 +1312,13 @@ msgstr "Мы ввели понятия центрального хранилищ #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." -msgstr "Мы рассмотрели на нескольких простых примерах, как при помощи Subversion два сотрудника могут публиковать и получать изменения, сделанные друг другом, используя модель \"копирование-изменение-слияние\"." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgstr "Мы рассмотрели на нескольких простых примерах, как при помощи Git два сотрудника могут публиковать и получать изменения, сделанные друг другом, используя модель \"копирование-изменение-слияние\"." #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." -msgstr "Мы немного поговорили о том, как Subversion отслеживает изменения и управляет информацией в рабочей копии." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." +msgstr "Мы немного поговорили о том, как Git отслеживает изменения и управляет информацией в рабочей копии." #. (title) #: ../source/TortoiseGit_en.xml:1445 @@ -1327,13 +1327,13 @@ msgstr "Установка и настройка сервера" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." -msgstr "Для использования TortoiseGit (или любого другого клиента Subversion) вам необходимо место, где будут располагаться хранилища. Вы можете содержать ваши хранилища локально и обращаться к ним, используя протокол file://, или же вы можете разместить их на сервере и получать доступ к ним посредством протоколов http:// или svn://. Оба этих протокола для работы с сервером могут ещё и шифроваться, в этом случае это будут протоколы https:// или svn+ssh://. Эта глава покажет вам шаг за шагом, как установить и настроить такого рода сервер на компьютере с Windows." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgstr "Для использования TortoiseGit (или любого другого клиента Git) вам необходимо место, где будут располагаться хранилища. Вы можете содержать ваши хранилища локально и обращаться к ним, используя протокол file://, или же вы можете разместить их на сервере и получать доступ к ним посредством протоколов http:// или svn://. Оба этих протокола для работы с сервером могут ещё и шифроваться, в этом случае это будут протоколы https:// или svn+ssh://. Эта глава покажет вам шаг за шагом, как установить и настроить такого рода сервер на компьютере с Windows." #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." -msgstr "Более подробную информацию о параметрах сервера Subversion, а также о том, как выбрать наилучшую архитектуру для вашей ситуации, можно найти в Книге о Subversion в разделе Server Configuration (Конфигурирование сервера)." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." +msgstr "Более подробную информацию о параметрах сервера Git, а также о том, как выбрать наилучшую архитектуру для вашей ситуации, можно найти в Книге о Git в разделе Server Configuration (Конфигурирование сервера)." #. (para) #: ../source/TortoiseGit_en.xml:1466 @@ -1357,8 +1357,8 @@ msgstr "Apache" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" -msgstr "Наиболее гибкая из всех возможных установок Subversion - это установка на основе Apache. Хотя её несколько сложнее устанавливать и настраивать, она предлагает преимущества, которые другие серверы предоставить не могут:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgstr "Наиболее гибкая из всех возможных установок Git - это установка на основе Apache. Хотя её несколько сложнее устанавливать и настраивать, она предлагает преимущества, которые другие серверы предоставить не могут:" #. (primary) #. (term) @@ -1369,8 +1369,8 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." -msgstr "Сервер Subversion на основе Apache использует протокол WebDAV, который также поддерживается многими другими программами. Вы можете, например, подключить хранилище как веб-папку в Проводнике Windows и обращаться к нему как к любой другой папке в файловой системе." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgstr "Сервер Git на основе Apache использует протокол WebDAV, который также поддерживается многими другими программами. Вы можете, например, подключить хранилище как веб-папку в Проводнике Windows и обращаться к нему как к любой другой папке в файловой системе." #. (term) #: ../source/TortoiseGit_en.xml:1509 @@ -1379,8 +1379,8 @@ msgstr "Просмотр хранилища при помощи веб-обоз #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." -msgstr "Вы можете указать в веб-обозревателе URL вашего хранилища и просматривать его содержимое даже без установленного клиента Subversion. Это предоставляет доступ к вашим данным значительно большему кругу пользователей." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." +msgstr "Вы можете указать в веб-обозревателе URL вашего хранилища и просматривать его содержимое даже без установленного клиента Git. Это предоставляет доступ к вашим данным значительно большему кругу пользователей." # проверка/подтверждение подлинности # Установление личности @@ -1465,19 +1465,19 @@ msgstr "Первое, что вам необходимо перед устано #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Установка Subversion" +msgid "Installing Git" +msgstr "Установка Git" -# Если у вас всё ещё используется более старый Apache 2.0.x, то пройдите по ссылке http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. +# Если у вас всё ещё используется более старый Apache 2.0.x, то пройдите по ссылке http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Загрузите последнюю версию исполняемых файлов Subversion под Win32 для Apache. Убедитесь, что вы получили правильную версию для интеграции с вашей версией Apache, иначе вы получите невразумительное сообщение об ошибке при перезапуске. Если у вас Apache версии 2.2.x, то пройдите по ссылке http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Загрузите последнюю версию исполняемых файлов Git под Win32 для Apache. Убедитесь, что вы получили правильную версию для интеграции с вашей версией Apache, иначе вы получите невразумительное сообщение об ошибке при перезапуске. Если у вас Apache версии 2.2.x, то пройдите по ссылке http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." -msgstr "Запустите установщик Subversion и следуйте инструкциям. Если установщик Subversion обнаружит установленный сервер Apache, то вы уже почти закончили. Если не сможет - вам надо будет выполнить несколько дополнительных шагов." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgstr "Запустите установщик Git и следуйте инструкциям. Если установщик Git обнаружит установленный сервер Apache, то вы уже почти закончили. Если не сможет - вам надо будет выполнить несколько дополнительных шагов." #. (primary) #. (primary) @@ -1488,13 +1488,13 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "Используя Проводник Windows, скопируйте из папки, где установлена Subversion (обычно c:\\program files\\Subversion), в папку с модулями Apache (обычно c:\\program files\\apache group\\apache2\\modules) файлы /httpd/mod_dav_svn.so и mod_authz_svn.so." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "Используя Проводник Windows, скопируйте из папки, где установлена Git (обычно c:\\program files\\Git), в папку с модулями Apache (обычно c:\\program files\\apache group\\apache2\\modules) файлы /httpd/mod_dav_svn.so и mod_authz_svn.so." #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." -msgstr "Скопируйте файлы /bin/libdb*.dll и /bin/intl3_svn.dll из папки, где установлена Subversion, в папку bin Apache." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." +msgstr "Скопируйте файлы /bin/libdb*.dll и /bin/intl3_svn.dll из папки, где установлена Git, в папку bin Apache." #. (para) #: ../source/TortoiseGit_en.xml:1677 @@ -1537,12 +1537,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "В конец файла настроек добавьте следующие строки:\n" "<Location /svn>\n" @@ -1551,12 +1551,12 @@ msgstr "" " SVNParentPath D:\\SVN\n" "# SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" "# AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" Эти настройки сообщают Apache о том, что все ваши хранилища Subversion физически располагаются внутри папки D:\\SVN. Хранилища предоставляются внешнему миру по URL: http://MyServer/svn/ . Доступ разрешён только известным пользователям/паролям, перечисленным в файле passwd." +" Эти настройки сообщают Apache о том, что все ваши хранилища Git физически располагаются внутри папки D:\\SVN. Хранилища предоставляются внешнему миру по URL: http://MyServer/svn/ . Доступ разрешён только известным пользователям/паролям, перечисленным в файле passwd." #. (para) #: ../source/TortoiseGit_en.xml:1740 @@ -1580,13 +1580,13 @@ msgstr "Перезапустите службу Apache." #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "Откройте в вашем веб-обозревателе http://MyServer/svn/MyNewRepository (где MyNewRepository - имя ранее созданного хранилища Subversion). Если всё сделано правильно, у вас будут запрошены имя пользователя и пароль, после чего вы сможете увидеть содержимое вашего хранилища." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "Откройте в вашем веб-обозревателе http://MyServer/svn/MyNewRepository (где MyNewRepository - имя ранее созданного хранилища Git). Если всё сделано правильно, у вас будут запрошены имя пользователя и пароль, после чего вы сможете увидеть содержимое вашего хранилища." #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "Итак, вы установили Apache и Subversion, но Apache до сих пор не знает, как работать с клиентами Subversion, такими как TortoiseGit. Для того, чтобы Apache знал, какой URL должен быть использован для хранилищ Subversion, вы должны отредактировать конфигурационный файл Apache (обычно c:\\program files\\apache group\\apache2\\conf\\httpd.conf) при помощи любого текстового редактора (например, Блокнота): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "Итак, вы установили Apache и Git, но Apache до сих пор не знает, как работать с клиентами Git, такими как TortoiseGit. Для того, чтобы Apache знал, какой URL должен быть использован для хранилищ Git, вы должны отредактировать конфигурационный файл Apache (обычно c:\\program files\\apache group\\apache2\\conf\\httpd.conf) при помощи любого текстового редактора (например, Блокнота): " #. (primary) #: ../source/TortoiseGit_en.xml:1777 @@ -1624,18 +1624,18 @@ msgstr "http://MyServer/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " -msgstr "означает, что хранилища Subversion доступны по URL " +msgid "means that the Git repositories are available from the URL " +msgstr "означает, что хранилища Git доступны по URL " #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "сообщает Apache, какой модуль будет ответственен за обслуживание этого URL, - в данном случае модуль Subversion." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." +msgstr "сообщает Apache, какой модуль будет ответственен за обслуживание этого URL, - в данном случае модуль Git." #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." -msgstr "Для Subversion версии 1.3 или более новой, это указание разрешает выдавать перечень всех доступных хранилищ в папке ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." +msgstr "Для Git версии 1.3 или более новой, это указание разрешает выдавать перечень всех доступных хранилищ в папке ." #. (filename) #: ../source/TortoiseGit_en.xml:1822 @@ -1644,8 +1644,8 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " -msgstr "предписывает Subversion искать хранилища в папке " +msgid "tells Git to look for repositories below " +msgstr "предписывает Git искать хранилища в папке " #. (entry) #: ../source/TortoiseGit_en.xml:1827 @@ -1670,8 +1670,8 @@ msgstr "указывает, какой файл паролей использо # !!! СП: тут в оригинале первая заглавная буква избыточна #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "расположение файла доступа для путей внутри хранилища Subversion" +msgid "Location of the Access file for paths inside a Git repository" +msgstr "расположение файла доступа для путей внутри хранилища Git" #. (entry) #: ../source/TortoiseGit_en.xml:1861 @@ -1705,11 +1705,11 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "Использование файла passwd ограничивает или разрешает доступ сразу ко всем вашим хранилищам. Если вам необходим лучший контроль за тем, какие пользователи имеют доступ к каждой папке внутри хранилища, вы можете разкомментировать строку \n" "#AuthzSVNAccessFile svnaccessfile\n" -" и создать файл доступа Subversion. Apache будет проверять, чтобы только дозволенные пользователи имели доступ к папке /svn, и после этой проверки будет передавать имя пользователя в модуль AuthzSVNAccessFile для того, чтобы можно было осуществить более тонко настроенный доступ на основе правил из файла доступа Subversion. Обратите внимание, пути указываются как хранилище:путь или просто путь. Если вы не укажете конкретное хранилище, это правило доступа будет применено ко всем хранилищам в папке SVNParentPath. Формат файла политики авторизации, используемого в mod_authz_svn, описан в " +" и создать файл доступа Git. Apache будет проверять, чтобы только дозволенные пользователи имели доступ к папке /svn, и после этой проверки будет передавать имя пользователя в модуль AuthzSVNAccessFile для того, чтобы можно было осуществить более тонко настроенный доступ на основе правил из файла доступа Git. Обратите внимание, пути указываются как хранилище:путь или просто путь. Если вы не укажете конкретное хранилище, это правило доступа будет применено ко всем хранилищам в папке SVNParentPath. Формат файла политики авторизации, используемого в mod_authz_svn, описан в " #. (para) #: ../source/TortoiseGit_en.xml:1915 @@ -1749,8 +1749,8 @@ msgstr "список проектов" #. (para) #: ../source/TortoiseGit_en.xml:1955 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." -msgstr "Если вы используете указание SVNParentPath, тогда вам не надо изменять конфигурационный файл Apache каждый раз при добавлении нового хранилища Subversion. Просто создайте новое хранилище в той же папке, где и первое хранилище, и всё! В моей компании у меня есть прямой доступ к этой папке на сервере посредством SMB (обычный доступ к файлам в Windows). Поэтому я просто создаю там новую папку, выполняю команду TortoiseGit TortoiseGitСоздать здесь хранилище... и у нового проекта уже есть свой дом..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgstr "Если вы используете указание SVNParentPath, тогда вам не надо изменять конфигурационный файл Apache каждый раз при добавлении нового хранилища Git. Просто создайте новое хранилище в той же папке, где и первое хранилище, и всё! В моей компании у меня есть прямой доступ к этой папке на сервере посредством SMB (обычный доступ к файлам в Windows). Поэтому я просто создаю там новую папку, выполняю команду TortoiseGit TortoiseGitСоздать здесь хранилище... и у нового проекта уже есть свой дом..." # !!! VS - настройку SVNListParentPath все таки может оставим директиву или параметр? У меня "настройку" ассоциируется с процессом, а не с "командой/параметром/директивой" # produce - 1) продукция, изделия, продукт 2) результат 3) производить, выпускать; вырабатывать; изготовлять; 4) создавать @@ -1759,8 +1759,8 @@ msgstr "Если вы используете указание SVNParent # listing в данном случае - действительно список, а не отчёт, в предыдущих версиях (при использовании скрипта на PHP) использовалось понятие index, что ближе к указателю. Реально создаётся список ссылок, так что вполне подойдёт и "создавать". #. (para) #: ../source/TortoiseGit_en.xml:1969 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." -msgstr "Если вы используете Subversion версии 1.3 или более поздней, вы можете использовать указание SVNListParentPath on для того, чтобы Apache создавал перечень всех доступных проектов при попытке открыть веб-обозревателем родительскую папку, а не конкретное хранилище." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgstr "Если вы используете Git версии 1.3 или более поздней, вы можете использовать указание SVNListParentPath on для того, чтобы Apache создавал перечень всех доступных проектов при попытке открыть веб-обозревателем родительскую папку, а не конкретное хранилище." #. (title) #: ../source/TortoiseGit_en.xml:1977 @@ -1774,8 +1774,8 @@ msgstr "авторизация" #. (para) #: ../source/TortoiseGit_en.xml:1984 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." -msgstr "Модуль mod_authz_svn позволяет детально управлять правами доступа, основываясь на именах пользователей и на путях в хранилище. Эта возможность доступна при работе с сервером Apache, а начиная с Subversion версии 1.3 она также доступна и в svnserve." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." +msgstr "Модуль mod_authz_svn позволяет детально управлять правами доступа, основываясь на именах пользователей и на путях в хранилище. Эта возможность доступна при работе с сервером Apache, а начиная с Git версии 1.3 она также доступна и в svnserve." #. (para) #: ../source/TortoiseGit_en.xml:1990 @@ -1923,12 +1923,12 @@ msgstr "" "LoadModule auth_module modules/mod_auth.so\n" "" -# "Для того, чтобы размещение Subversion использовало этот тип аутентификации, вы должны изменить строку \n +# "Для того, чтобы размещение Git использовало этот тип аутентификации, вы должны изменить строку \n # СП: размещений (location) на одном сервере, вообще говоря, может быть несколько, и каждое со своими настройками #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1942,7 +1942,7 @@ msgid "" "SSPIOfferBasic On\n" " within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" -"Для того чтобы это размещение Subversion использовало этот тип аутентификации, вы должны изменить строку \n" +"Для того чтобы это размещение Git использовало этот тип аутентификации, вы должны изменить строку \n" "AuthType Basic\n" " на \n" "AuthType SSPI\n" @@ -1959,7 +1959,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2119 msgid "Note that if you are authenticating using SSPI, then you don't need the AuthUserFile line to define a password file any more. Apache authenticates your username and password against your windows domain instead. You will need to update the users list in your svnaccessfile to reference DOMAIN\\username as well." -msgstr "Заметьте, что если вы производите аутентификацию при помощи SSPI, то вам больше не нужна строка AuthUserFile для определения файла паролей. Вместо этого Apache аутентифицирует ваши имя пользователя и пароль при помощи домена Windows. Дополнительно вам необходимо будет обновить список пользователей в файле доступа Subversion (svnaccessfile) для того, чтобы они и там указывались как ДОМЕН\\имя_пользователя." +msgstr "Заметьте, что если вы производите аутентификацию при помощи SSPI, то вам больше не нужна строка AuthUserFile для определения файла паролей. Вместо этого Apache аутентифицирует ваши имя пользователя и пароль при помощи домена Windows. Дополнительно вам необходимо будет обновить список пользователей в файле доступа Git (svnaccessfile) для того, чтобы они и там указывались как ДОМЕН\\имя_пользователя." #. (para) #: ../source/TortoiseGit_en.xml:2129 @@ -1973,8 +1973,8 @@ msgstr "Для включения SSL на вашем сервере, смотр #. (para) #: ../source/TortoiseGit_en.xml:2140 -msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." -msgstr "Файлы AuthzSVNAccessFile в Subversion учитывают регистр в именах пользователей (JUser отличается от juser)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgstr "Файлы AuthzSVNAccessFile в Git учитывают регистр в именах пользователей (JUser отличается от juser)." #. (para) #: ../source/TortoiseGit_en.xml:2145 @@ -1983,8 +1983,8 @@ msgstr "В мире Microsoft домены Windows и имена пользов #. (para) #: ../source/TortoiseGit_en.xml:2150 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." -msgstr "Эта разница может затронуть вас при использовании аутентификации SSPI, поскольку домены Windows и имена пользователей передаются в Subversion в том виде, в каком пользователь набрал их при запросе. Internet Explorer часто передаёт имя пользователя Apache автоматически, используя тот же регистр, который был использован при создании учётной записи." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgstr "Эта разница может затронуть вас при использовании аутентификации SSPI, поскольку домены Windows и имена пользователей передаются в Git в том виде, в каком пользователь набрал их при запросе. Internet Explorer часто передаёт имя пользователя Apache автоматически, используя тот же регистр, который был использован при создании учётной записи." #. (para) #: ../source/TortoiseGit_en.xml:2158 @@ -1993,8 +1993,8 @@ msgstr "В итоге, вам может понадобиться по край #. (para) #: ../source/TortoiseGit_en.xml:2166 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." -msgstr "Журнал ошибок и журнал доступа Apache - ваши лучшие друзья в расшифровывании такого рода проблем, поскольку они помогут вам определить строку с именем пользователя, переданную в модуль AuthzSVNAccessFile Subversion. Возможно, вам придётся поэкспериментировать с точным форматом строки пользователя в файле svnaccessfile (например, ДОМЕН\\пользователь или ДОМЕН//пользователь) для того, чтобы всё работало." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgstr "Журнал ошибок и журнал доступа Apache - ваши лучшие друзья в расшифровывании такого рода проблем, поскольку они помогут вам определить строку с именем пользователя, переданную в модуль AuthzSVNAccessFile Git. Возможно, вам придётся поэкспериментировать с точным форматом строки пользователя в файле svnaccessfile (например, ДОМЕН\\пользователь или ДОМЕН//пользователь) для того, чтобы всё работало." #. (title) #: ../source/TortoiseGit_en.xml:2180 @@ -2008,8 +2008,8 @@ msgstr "множественная аутентификация" #. (para) #: ../source/TortoiseGit_en.xml:2184 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." -msgstr "Возможно использование более одного поставщика аутентификации для хранилища Subversion. Для этого необходимо сделать каждый тип аутентификации не-авторитарным (non-authoritative), чтобы Apache проверял несколько поставщиков на подходящие имя_пользователя/пароль." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgstr "Возможно использование более одного поставщика аутентификации для хранилища Git. Для этого необходимо сделать каждый тип аутентификации не-авторитарным (non-authoritative), чтобы Apache проверял несколько поставщиков на подходящие имя_пользователя/пароль." #. (para) #: ../source/TortoiseGit_en.xml:2190 @@ -2039,7 +2039,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2064,7 +2064,7 @@ msgstr "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2193,15 +2193,15 @@ msgstr "SSL и Internet Explorer" # СП: аутентифицируется пользователь, а программа только это обеспечивает #. (para) #: ../source/TortoiseGit_en.xml:2339 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." -msgstr "Если вы обезопасили свой сервер при помощи SSL и используете аутентификацию при помощи домена Windows, вы обнаружите, что просмотр хранилища при помощи Internet Explorer больше не работает. Не волнуйтесь - это только Internet Explorer не способен провести аутентификацию. В других обозревателях такой проблемы нет, так что TortoiseGit и любой другой клиент Subversion по-прежнему способны проводить аутентификацию." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." +msgstr "Если вы обезопасили свой сервер при помощи SSL и используете аутентификацию при помощи домена Windows, вы обнаружите, что просмотр хранилища при помощи Internet Explorer больше не работает. Не волнуйтесь - это только Internet Explorer не способен провести аутентификацию. В других обозревателях такой проблемы нет, так что TortoiseGit и любой другой клиент Git по-прежнему способны проводить аутентификацию." # Location /path это команда. Её переводить не нужно # СП: /path в указании Location - это как раз путь, который будет обрабатывать Apache, хотя, для не-админов, возможно, надо не только перевести, но и дать дополнительные пояснения #. (para) #: ../source/TortoiseGit_en.xml:2353 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." -msgstr "задайте отдельное указание <Location /путь> в конфигурационном файле Apache, и добавьте SSPIBasicPreferred On. Это позволит IE аутентифицироваться, но зато другие обозреватели и Subversion не будут способны аутентифицироваться для этого размещения." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." +msgstr "задайте отдельное указание <Location /путь> в конфигурационном файле Apache, и добавьте SSPIBasicPreferred On. Это позволит IE аутентифицироваться, но зато другие обозреватели и Git не будут способны аутентифицироваться для этого размещения." #. (para) #: ../source/TortoiseGit_en.xml:2363 @@ -2235,8 +2235,8 @@ msgstr "Принудительное использование SSL при до #. (para) #: ../source/TortoiseGit_en.xml:2395 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." -msgstr "После того, как вы настроили SSL для большей безопасности хранилища, возможно, вы пожелаете отключить обычный доступ не через SSL (http), и оставить доступ только через https. Для этого вы должны добавить ещё одно указание в блок <Location> Subversion: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." +msgstr "После того, как вы настроили SSL для большей безопасности хранилища, возможно, вы пожелаете отключить обычный доступ не через SSL (http), и оставить доступ только через https. Для этого вы должны добавить ещё одно указание в блок <Location> Git: SSLRequireSSL." #. (para) #: ../source/TortoiseGit_en.xml:2402 @@ -2247,7 +2247,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2260,7 +2260,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" "# AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2279,8 +2279,8 @@ msgstr "Прислано в список рассылки TortoiseGit Найдж #. (para) #: ../source/TortoiseGit_en.xml:2424 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." -msgstr "В некоторых серверных конфигурациях вам может быть необходимо настроить один сервер, включающий 2 виртуальных SSL-узла: один для общего доступа через веб (не требующий клиентского сертификата), другой должен быть безопасным, с запросом клиентского сертификата, на котором и работает сервер Subversion." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." +msgstr "В некоторых серверных конфигурациях вам может быть необходимо настроить один сервер, включающий 2 виртуальных SSL-узла: один для общего доступа через веб (не требующий клиентского сертификата), другой должен быть безопасным, с запросом клиентского сертификата, на котором и работает сервер Git." #. (para) #: ../source/TortoiseGit_en.xml:2430 @@ -2290,11 +2290,11 @@ msgstr "Добавление указания SSLVerifyClient Optional< #. (para) #: ../source/TortoiseGit_en.xml:2440 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" -"Решением будет добавление следующего указания к папке виртуального узла, к которой желательно ограничить доступ для использования Subversion \n" +"Решением будет добавление следующего указания к папке виртуального узла, к которой желательно ограничить доступ для использования Git \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " Это указание предоставляет доступ к папке только в случае, если сертификат клиента был получен и проверен успешно." @@ -2312,10 +2312,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2337,10 +2337,10 @@ msgstr "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Конфигурация виртуального узла SUBVERSION\n" +"### Конфигурация виртуального узла Git\n" "### (требующего клиентский сертификат)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"корневой путь узла subversion\">\n" +" <Directory \"корневой путь узла Git\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2358,8 +2358,8 @@ msgstr "Сервер на основе Svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2485 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." -msgstr "Возможны случаи, когда невозможно использовать Apache в качестве вашего сервера. К счастью, в Subversion есть Svnserve - облегчённый автономный сервер, использующий собственный протокол поверх обычного TCP/IP соединения." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgstr "Возможны случаи, когда невозможно использовать Apache в качестве вашего сервера. К счастью, в Git есть Svnserve - облегчённый автономный сервер, использующий собственный протокол поверх обычного TCP/IP соединения." #. (para) #: ../source/TortoiseGit_en.xml:2491 @@ -2373,23 +2373,23 @@ msgstr "Установка svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2502 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." -msgstr "Загрузите последнюю версию Subversion по адресу http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Или загрузите заранее настроенный установщик с сайта CollabNet по адресу http://www.collab.net/downloads/subversion. Этот установщик настроит запуск svnserve в качестве службы Windows, а также в него включено несколько инструментов, которые вам понадобятся, если вы собираетесь использовать для безопасности SASL." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgstr "Загрузите последнюю версию Git по адресу http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Или загрузите заранее настроенный установщик с сайта CollabNet по адресу http://www.collab.net/downloads/Git. Этот установщик настроит запуск svnserve в качестве службы Windows, а также в него включено несколько инструментов, которые вам понадобятся, если вы собираетесь использовать для безопасности SASL." #. (para) #: ../source/TortoiseGit_en.xml:2516 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." -msgstr "Если у вас уже установлена какая-либо из версий Subversion и запущен svnserve, то перед тем, как продолжить, вам необходимо его остановить." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." +msgstr "Если у вас уже установлена какая-либо из версий Git и запущен svnserve, то перед тем, как продолжить, вам необходимо его остановить." #. (para) #: ../source/TortoiseGit_en.xml:2522 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." -msgstr "Запустите установщик Subversion. В случае, если вы запустили установку на вашем сервере (рекомендуемый вариант), можете пропустить шаг 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." +msgstr "Запустите установщик Git. В случае, если вы запустили установку на вашем сервере (рекомендуемый вариант), можете пропустить шаг 4." #. (para) #: ../source/TortoiseGit_en.xml:2528 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "При помощи Проводника Windows откройте папку, где установлена Subversion (обычно C:\\Program Files\\Subversion) и в папке bin найдите файлы svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll и ssleay32.dll и скопируйте эти файлы (или сразу всю папку bin) в папку на вашем сервере, например c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "При помощи Проводника Windows откройте папку, где установлена Git (обычно C:\\Program Files\\Git) и в папке bin найдите файлы svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll и ssleay32.dll и скопируйте эти файлы (или сразу всю папку bin) в папку на вашем сервере, например c:\\svnserve" #. (title) #: ../source/TortoiseGit_en.xml:2550 @@ -2460,36 +2460,36 @@ msgstr "Запуск svnserve как службы" #. (para) #: ../source/TortoiseGit_en.xml:2624 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." -msgstr "Как правило, запускать svnserve как обычную программу - не самый лучший способ: это означает, всегда должен быть пользователь, вошедший в систему на сервере, и что надо не забывать запускать её каждый раз после перезагрузки. Есть лучший способ - запуск и исполнение svnserve как службы Windows. Начиная с Subversion 1.4, svnserve может быть установлен как обычная служба Windows." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." +msgstr "Как правило, запускать svnserve как обычную программу - не самый лучший способ: это означает, всегда должен быть пользователь, вошедший в систему на сервере, и что надо не забывать запускать её каждый раз после перезагрузки. Есть лучший способ - запуск и исполнение svnserve как службы Windows. Начиная с Git 1.4, svnserve может быть установлен как обычная служба Windows." #. (para) #: ../source/TortoiseGit_en.xml:2631 msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Для того, чтобы установить svnserve как обычную службу Windows, выполните следующую команду, создающую службу, автоматически запускаемую при запуске Windows (всё в одной строке): \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " Если где-нибудь в пути встречаются пробелы, необходимо заключить путь в заэкранированные кавычки, вот так: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " Вы также можете добавить описание после создания службы, которое будет показываться в оснастке 'Управление службами Windows'. \n" -"sc description svnserve \"Сервер Subversion (svnserve)\"\n" +"sc description svnserve \"Сервер Git (svnserve)\"\n" "" #. (para) @@ -2502,11 +2502,11 @@ msgstr "Обратите внимание на довольно необычны msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Теперь Microsoft рекомендует, чтобы службы выполнялись под учётной записью или Локальной службы, или Сетевой службы. Обратитесь к The Services and Service Accounts Security Planning Guide. Для создания службы под учётной записью Локальной службы, добавьте к вышеприведённому примеру следующее: \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Заметьте, вы должны будете предоставить учётной записи Локальной службы соответствующие права и к Subversion, и к хранилищам. Такие же права потребуются и любым приложениям, которые используются скриптами ловушек. Встроенная группа для этого называется просто \"СЛУЖБА\" (в английской версии - \"LOCAL SERVICE\")." +" Заметьте, вы должны будете предоставить учётной записи Локальной службы соответствующие права и к Git, и к хранилищам. Такие же права потребуются и любым приложениям, которые используются скриптами ловушек. Встроенная группа для этого называется просто \"СЛУЖБА\" (в английской версии - \"LOCAL SERVICE\")." #. (para) #: ../source/TortoiseGit_en.xml:2678 @@ -2582,12 +2582,12 @@ msgstr "" "...\n" " Этот пример запрещает любой доступ для анонимных (неаутентифицированных) пользователей, и предоставляет доступ для чтения-записи пользователям, перечисленным в userfile." -# !!! надо будет отредактировать ссылки по переведённой документации Subversion +# !!! надо будет отредактировать ссылки по переведённой документации Git # !!! хотя "Кэширование клиентских учётных данных" мне больше нравиться, чем "Кеширование клиентской идентификационной информации" #. (para) #: ../source/TortoiseGit_en.xml:2755 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" -msgstr "Если у вас есть несколько хранилищ, использующих одну базу данных паролей, то применение области аутентификации сделает жизнь пользователей легче, поскольку TortoiseGit может запоминать учётные данные и вам достаточно будет ввести их только однажды. Дополнительная информация содержится в Книге о Subversion, а именно в разделах Create a 'users' file and realm (Создание файла 'users' и области аутентификации) и Client Credentials Caching (Кэширование клиентских учётных данных)" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgstr "Если у вас есть несколько хранилищ, использующих одну базу данных паролей, то применение области аутентификации сделает жизнь пользователей легче, поскольку TortoiseGit может запоминать учётные данные и вам достаточно будет ввести их только однажды. Дополнительная информация содержится в Книге о Git, а именно в разделах Create a 'users' file and realm (Создание файла 'users' и области аутентификации) и Client Credentials Caching (Кэширование клиентских учётных данных)" #. (title) #: ../source/TortoiseGit_en.xml:2773 @@ -2606,13 +2606,13 @@ msgstr "Что такое SASL?" #. (para) #: ../source/TortoiseGit_en.xml:2779 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." -msgstr "Простой уровень аутентификации и безопасности Сайрус (Cyrus Simple Authentication and Security Layer, SASL) - это ПО с открытым исходным кодом, написанное в университете Карнеги-Меллона. Оно добавляет общие возможности по аутентификации и шифрованию в любой сетевой протокол, и, начиная с Subversion 1.5, сервер svnserve и клиент TortoiseGit знают, как использовать эту библиотеку." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgstr "Простой уровень аутентификации и безопасности Сайрус (Cyrus Simple Authentication and Security Layer, SASL) - это ПО с открытым исходным кодом, написанное в университете Карнеги-Меллона. Оно добавляет общие возможности по аутентификации и шифрованию в любой сетевой протокол, и, начиная с Git 1.5, сервер svnserve и клиент TortoiseGit знают, как использовать эту библиотеку." #. (para) #: ../source/TortoiseGit_en.xml:2787 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." -msgstr "Более полное обсуждение доступных параметров приводится в книге о Subversion в разделе Using svnserve with SASL (Использование svnserve с SASL). Если же вам нужен простой способ настройки безопасных аутентификации и шифрования на Windows-сервере, чтобы обеспечить безопасный доступ к вашему хранилищу через большой опасный Интернет, то читайте дальше." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgstr "Более полное обсуждение доступных параметров приводится в книге о Git в разделе Using svnserve with SASL (Использование svnserve с SASL). Если же вам нужен простой способ настройки безопасных аутентификации и шифрования на Windows-сервере, чтобы обеспечить безопасный доступ к вашему хранилищу через большой опасный Интернет, то читайте дальше." #. (title) #: ../source/TortoiseGit_en.xml:2800 @@ -2632,13 +2632,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2810 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." -msgstr "Во-вторых, создайте файл с названием svn.conf в подходящем месте - обычно это папка, в которой установлена Subversion." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." +msgstr "Во-вторых, создайте файл с названием svn.conf в подходящем месте - обычно это папка, в которой установлена Git." #. (para) #: ../source/TortoiseGit_en.xml:2815 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." -msgstr "В-третьих, создайте два новых ключа реестра, служащих для того, чтобы сообщить SASL, где искать необходимые вещи. Создайте раздел реестра с названием [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] и поместите в него два новых строковых параметра: SearchPath, указывающий путь к папке, содержащей дополнительные подключаемые модули sasl*.dll (обычно это папка установки Subversion), и ConfFile, задающий папку, содержащую файл svn.conf. Если вы использовали установщик CollabNet, то эти параметры реестра для вас уже были созданы." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgstr "В-третьих, создайте два новых ключа реестра, служащих для того, чтобы сообщить SASL, где искать необходимые вещи. Создайте раздел реестра с названием [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] и поместите в него два новых строковых параметра: SearchPath, указывающий путь к папке, содержащей дополнительные подключаемые модули sasl*.dll (обычно это папка установки Git), и ConfFile, задающий папку, содержащую файл svn.conf. Если вы использовали установщик CollabNet, то эти параметры реестра для вас уже были созданы." #. (para) #: ../source/TortoiseGit_en.xml:2827 @@ -2727,8 +2727,8 @@ msgstr "Основной метод настройки сервера приве #. (para) #: ../source/TortoiseGit_en.xml:2915 -msgid "Further information about svnserve can be found in the Version Control with Subversion." -msgstr "Дополнительную информацию о svnserve можно найти в Книге о Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." +msgstr "Дополнительную информацию о svnserve можно найти в Книге о Git." #. (title) #: ../source/TortoiseGit_en.xml:2923 @@ -2738,25 +2738,25 @@ msgstr "Авторизация с учётом пути в svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" -"Начиная с Subversion версии 1.3, svnserve поддерживает ту же схему авторизации с учётом пути mod_authz_svn, которая доступна с сервером Apache. Вам необходимо отредактировать файл conf/svnserve.conf в папке вашего хранилища и добавить строку, ссылающуюся на файл авторизации. \n" +"Начиная с Git версии 1.3, svnserve поддерживает ту же схему авторизации с учётом пути mod_authz_svn, которая доступна с сервером Apache. Вам необходимо отредактировать файл conf/svnserve.conf в папке вашего хранилища и добавить строку, ссылающуюся на файл авторизации. \n" "[general]\n" "authz-db = authz\n" " Здесь, authz - файл, созданный вами для задания разрешений доступа. Вы можете использовать отдельный файл для каждого хранилища, или же вы можете использовать один и тот же файл для нескольких хранилищ. Формат файла описан в ." #. (para) #: ../source/TortoiseGit_en.xml:2946 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." -msgstr "Каким бы протоколом вы ни пользовались для доступа к своим хранилищам, вам в любом случае потребуется создать хотя бы одно хранилище. Это может быть сделано как при помощи клиента Subversion для командной строки, так и при помощи TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." +msgstr "Каким бы протоколом вы ни пользовались для доступа к своим хранилищам, вам в любом случае потребуется создать хотя бы одно хранилище. Это может быть сделано как при помощи клиента Git для командной строки, так и при помощи TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:2951 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "Если вы ещё не создали хранилище Subversion, самое время этим заняться." +msgid "If you haven't created a Git repository yet, it's time to do that now." +msgstr "Если вы ещё не создали хранилище Git, самое время этим заняться." #. (title) #: ../source/TortoiseGit_en.xml:2959 @@ -2768,13 +2768,13 @@ msgstr "Создание хранилища" msgid "create repository" msgstr "создание хранилища" -# !!! надо будет отредактировать ссылки по переведённой документации Subversion +# !!! надо будет отредактировать ссылки по переведённой документации Git # Несмотря на то, что имена серверов и путей в данной главе указаны с использованием русских букв, моя рекомендация состоит в том, что для имени компьютера и путей нужно использовать только символы английского алфавита. Так как реальные хранилища обычно живут гораздо дольше, чем предполагают их авторы, и имеют свойство разростаться, то возникает проблема с переходом на другое оборудование и/или операционную систему для его нормального функционирования. Использование только английских букв и арабских цифр уменьшает количество проблем, с которыми вы, возоможно, столкнетесь при эксплуатации хранилища - примечание переводчика. # !!! Repository Data-Stores - Способы хранения/содержания/накопления данных в хранилище #. (para) #: ../source/TortoiseGit_en.xml:2963 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." -msgstr "Вы можете создать хранилище или в формате FSFS, или в более старом формате Berkeley Database (BDB). Формат FSFS обычно быстрее и более лёгок в администрировании, также он сейчас без проблем работает на сетевых разделяемых ресурсах и в Windows 98. Формат BDB одно время рассматривался как более стабильный - просто потому, что использовался дольше, но, поскольку FSFS используется для реальной работы вот уже несколько лет, это соображение теперь не существенно. Прочтите Choosing a Data Store (Выбор формата хранилища) в Книге о Subversion для дополнительной информации." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." +msgstr "Вы можете создать хранилище или в формате FSFS, или в более старом формате Berkeley Database (BDB). Формат FSFS обычно быстрее и более лёгок в администрировании, также он сейчас без проблем работает на сетевых разделяемых ресурсах и в Windows 98. Формат BDB одно время рассматривался как более стабильный - просто потому, что использовался дольше, но, поскольку FSFS используется для реальной работы вот уже несколько лет, это соображение теперь не существенно. Прочтите Choosing a Data Store (Выбор формата хранилища) в Книге о Git для дополнительной информации." #. (title) #: ../source/TortoiseGit_en.xml:2978 @@ -2885,8 +2885,8 @@ msgstr "пути UNC" #. (para) #: ../source/TortoiseGit_en.xml:3094 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." -msgstr "Для доступа к вашему локальному хранилищу вам необходим путь к этой папке. Только запомните, что Subversion принимает все пути к хранилищам в виде file:///C:/хранилищеSVN/. Обратите внимание, что везде используется прямая косая черта." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgstr "Для доступа к вашему локальному хранилищу вам необходим путь к этой папке. Только запомните, что Git принимает все пути к хранилищам в виде file:///C:/хранилищеSVN/. Обратите внимание, что везде используется прямая косая черта." #. (para) #: ../source/TortoiseGit_en.xml:3100 @@ -2925,8 +2925,8 @@ msgstr "Во первых, вы предоставляете каждому по #. (para) #: ../source/TortoiseGit_en.xml:3141 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." -msgstr "Во вторых,не все протоколы разделения файлов по сети поддерживают блокировку, необходимую для Subversion, и вы можете обнаружить, что ваше хранилище повреждено. Возможно, это случится не сразу, но когда-нибудь два пользователя попробуют получить доступ к хранилищу в одно и то же время." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgstr "Во вторых,не все протоколы разделения файлов по сети поддерживают блокировку, необходимую для Git, и вы можете обнаружить, что ваше хранилище повреждено. Возможно, это случится не сразу, но когда-нибудь два пользователя попробуют получить доступ к хранилищу в одно и то же время." #. (para) #: ../source/TortoiseGit_en.xml:3147 @@ -3032,8 +3032,8 @@ msgstr "В случае принятия подхода, когда /t #. (para) #: ../source/TortoiseGit_en.xml:3220 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." -msgstr "Для несвязанных проектов вы можете предпочесть использовать раздельные хранилища. Когда вы фиксируете изменения, изменяется номер ревизии для всего хранилища, а не номер ревизии проекта. Когда два несвязанных проекта совместно используют одно хранилище, могут образовываться большие промежутки в номерах ревизий. Проекты Subversion и TortoiseGit обладают одним адресом сетевого узла, но у них полностью раздельные хранилища, делающие возможной независимую разработку, без путаницы по поводу номеров сборок." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgstr "Для несвязанных проектов вы можете предпочесть использовать раздельные хранилища. Когда вы фиксируете изменения, изменяется номер ревизии для всего хранилища, а не номер ревизии проекта. Когда два несвязанных проекта совместно используют одно хранилище, могут образовываться большие промежутки в номерах ревизий. Проекты Git и TortoiseGit обладают одним адресом сетевого узла, но у них полностью раздельные хранилища, делающие возможной независимую разработку, без путаницы по поводу номеров сборок." #. (para) #: ../source/TortoiseGit_en.xml:3230 @@ -3121,8 +3121,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3332 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "Утилита svnadmin устанавливается автоматически при установке клиента командной строки Subversion. Если вы устанавливаете инструменты командной строки на ПК с Windows, то из доступных вариантов лучше загрузить установщик для Windows. Он сжат более эффективно, чем .zip-версия, так что объем закачки меньше, и он для вас установит необходимые пути. Вы можете загрузить последнюю версию клиента командной строки с http://Subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "Утилита svnadmin устанавливается автоматически при установке клиента командной строки Git. Если вы устанавливаете инструменты командной строки на ПК с Windows, то из доступных вариантов лучше загрузить установщик для Windows. Он сжат более эффективно, чем .zip-версия, так что объем закачки меньше, и он для вас установит необходимые пути. Вы можете загрузить последнюю версию клиента командной строки с http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:3347 @@ -3148,8 +3148,8 @@ msgstr "скрипты ловушек, выполняемые на сторон #. (para) #: ../source/TortoiseGit_en.xml:3357 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." -msgstr "Ловушка - это программа, запускаемая по какому-либо событию в хранилище, такому как создание новой ревизии или изменение неверсированного свойства. Каждой ловушке передаётся достаточно информации для того, чтобы узнать, что это за событие, какие объекты затронуты, а также имя пользователя, инициировавшего событие. В зависимости от вывода или возвращаемого значения ловушки, программа ловушки может продолжить действие, прекратить его, или приостановить некоторым образом. За дополнительной информацией о реализованных ловушках обращайтесь, пожалуйста, к главе Hook Scripts (Скрипты ловушек) в книге о Subversion." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." +msgstr "Ловушка - это программа, запускаемая по какому-либо событию в хранилище, такому как создание новой ревизии или изменение неверсированного свойства. Каждой ловушке передаётся достаточно информации для того, чтобы узнать, что это за событие, какие объекты затронуты, а также имя пользователя, инициировавшего событие. В зависимости от вывода или возвращаемого значения ловушки, программа ловушки может продолжить действие, прекратить его, или приостановить некоторым образом. За дополнительной информацией о реализованных ловушках обращайтесь, пожалуйста, к главе Hook Scripts (Скрипты ловушек) в книге о Git." #. (para) #: ../source/TortoiseGit_en.xml:3372 @@ -3204,8 +3204,8 @@ msgstr "веб-сайт" #. (para) #: ../source/TortoiseGit_en.xml:3411 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." -msgstr "Если вы желаете сделать своё хранилище Subversion доступным для других, вы можете разместить ссылку на него на вашем веб-сайте. Один из путей достижения большей доступности - размещение ссылки для извлечения для других пользователей TortoiseGit." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgstr "Если вы желаете сделать своё хранилище Git доступным для других, вы можете разместить ссылку на него на вашем веб-сайте. Один из путей достижения большей доступности - размещение ссылки для извлечения для других пользователей TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:3417 @@ -3270,18 +3270,18 @@ msgstr "Руководство по ежедневному использова #. (para) #: ../source/TortoiseGit_en.xml:3457 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." -msgstr "В этом документе описано использование TortoiseGit, как оно происходит изо дня в день. Это не введение в системы управления версиями, и не введение в Subversion (SVN). Эта глава более похожа на то, к чему вы можете обратиться, когда вы приблизительно знаете, что нужно сделать, но не помните точно, как это делается." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgstr "В этом документе описано использование TortoiseGit, как оно происходит изо дня в день. Это не введение в системы управления версиями, и не введение в Git (SVN). Эта глава более похожа на то, к чему вы можете обратиться, когда вы приблизительно знаете, что нужно сделать, но не помните точно, как это делается." #. (para) #: ../source/TortoiseGit_en.xml:3465 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." -msgstr "Если вам нужно введение в управление версиями с использованием Subversion, тогда мы рекомендуем прочитать чудесную книгуВ других частях этого документа эта книга фигурирует как \"Книга о Subversion\". Она доступна на английском, русском и некоторых других языках - прим. переводчика: Управление версиями в Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." +msgstr "Если вам нужно введение в управление версиями с использованием Git, тогда мы рекомендуем прочитать чудесную книгуВ других частях этого документа эта книга фигурирует как \"Книга о Git\". Она доступна на английском, русском и некоторых других языках - прим. переводчика: Управление версиями в Git." #. (para) #: ../source/TortoiseGit_en.xml:3472 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." -msgstr "Работа над этим документом продолжается, также как и над TortoiseGit и Subversion. Если вы нашли какие-нибудь ошибки, пожалуйста, сообщите о них в список рассылки, чтобы мы могли обновить документацию. Некоторые копии экранов в Руководстве по ежедневному использованию могут не соответствовать текущему состоянию программы. Пожалуйста, простите нас: мы работаем над TortoiseGit в своё свободное время." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgstr "Работа над этим документом продолжается, также как и над TortoiseGit и Git. Если вы нашли какие-нибудь ошибки, пожалуйста, сообщите о них в список рассылки, чтобы мы могли обновить документацию. Некоторые копии экранов в Руководстве по ежедневному использованию могут не соответствовать текущему состоянию программы. Пожалуйста, простите нас: мы работаем над TortoiseGit в своё свободное время." #. (para) #: ../source/TortoiseGit_en.xml:3484 @@ -3295,13 +3295,13 @@ msgstr "Вы должны быть знакомы с системами упра #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." -msgstr "Вы должны знать основы Subversion." +msgid "You should know the basics of Git." +msgstr "Вы должны знать основы Git." #. (para) #: ../source/TortoiseGit_en.xml:3499 -msgid "You should have set up a server and/or have access to a Subversion repository." -msgstr "Вы должны установить и настроить сервер и/или иметь доступ к хранилищу Subversion." +msgid "You should have set up a server and/or have access to a Git repository." +msgstr "Вы должны установить и настроить сервер и/или иметь доступ к хранилищу Git." #. (para) #: ../source/TortoiseGit_en.xml:3480 @@ -3489,16 +3489,16 @@ msgstr "svn.ssl.server содержит серверные msgid "svn.username contains credentials for username-only authentication (no password needed)." msgstr "svn.username содержит учётные данные для аутентификации только по имени пользователя (без пароля). " -# Для каждого сервера, к которому вы получаете доступ, используется отдельный текстовый файл, и посмотреть, к какому серверу он относится, можно при помощи текстового редактора. Для того, чтобы Subversion и TortoiseGit (и любой другой клиент Subversion) забыли ваши учётные данные для конкретного сервера, вам надо просто удалить соответствующий файл. +# Для каждого сервера, к которому вы получаете доступ, используется отдельный текстовый файл, и посмотреть, к какому серверу он относится, можно при помощи текстового редактора. Для того, чтобы Git и TortoiseGit (и любой другой клиент Git) забыли ваши учётные данные для конкретного сервера, вам надо просто удалить соответствующий файл. #. (para) #: ../source/TortoiseGit_en.xml:3650 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " -msgstr "Если вы пытаетесь подключиться к хранилищу, защищённому паролем, появится диалог аутентификации. Введите ваше имя пользователя и пароль. При помощи флажка можно сделать так, чтобы эти данные сохранялись TortoiseGit в папке по умолчанию Subversion: $APPDATA\\Subversion\\auth в трёх подпапках: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " +msgstr "Если вы пытаетесь подключиться к хранилищу, защищённому паролем, появится диалог аутентификации. Введите ваше имя пользователя и пароль. При помощи флажка можно сделать так, чтобы эти данные сохранялись TortoiseGit в папке по умолчанию Git: $APPDATA\\Git\\auth в трёх подпапках: " #. (para) #: ../source/TortoiseGit_en.xml:3681 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." -msgstr "Очистить кэш аутентификации для всех серверов можно со страницы Сохранённые данные диалога настроек TortoiseGit. Там находится кнопка, очищающая все закэшированные данные аутентификации из папок auth Subversion, так же как и любые аутентификационные данные, сохранённые в реестре более ранними версиями TortoiseGit. Смотрите ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgstr "Очистить кэш аутентификации для всех серверов можно со страницы Сохранённые данные диалога настроек TortoiseGit. Там находится кнопка, очищающая все закэшированные данные аутентификации из папок auth Git, так же как и любые аутентификационные данные, сохранённые в реестре более ранними версиями TortoiseGit. Смотрите ." #. (para) #: ../source/TortoiseGit_en.xml:3690 @@ -3574,8 +3574,8 @@ msgstr "Можно легко импортировать совсем на не #. (para) #: ../source/TortoiseGit_en.xml:3736 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." -msgstr "Этот раздел описывает команду импорта Subversion, которая предназначена для импорта иерархии папок в хранилище за один подход. Несмотря на то, что она это делает, у неё есть несколько недостатков: По этим причинам мы рекомендуем, чтобы вы вообще не использовали команду импорта, за исключением, конечно, выполнения двухшагового метода, описанного в . Но поскольку вы уже здесь, вот как в основном работает импорт..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgstr "Этот раздел описывает команду импорта Git, которая предназначена для импорта иерархии папок в хранилище за один подход. Несмотря на то, что она это делает, у неё есть несколько недостатков: По этим причинам мы рекомендуем, чтобы вы вообще не использовали команду импорта, за исключением, конечно, выполнения двухшагового метода, описанного в . Но поскольку вы уже здесь, вот как в основном работает импорт..." #. (para) #: ../source/TortoiseGit_en.xml:3768 @@ -3694,8 +3694,8 @@ msgstr "Например, вы можете посмотреть на скрип #. (para) #: ../source/TortoiseGit_en.xml:3916 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." -msgstr "И чтобы не сбивать с толку пользователей, мы также добавили файл TortoiseVars.bat в список игнорирования для его родительской папки, т.е. мы устанавливаем свойство Subversion svn:ignore так, чтобы оно включало это имя файла. Таким образом, оно не показывается как неверсированное при каждой фиксации." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgstr "И чтобы не сбивать с толку пользователей, мы также добавили файл TortoiseVars.bat в список игнорирования для его родительской папки, т.е. мы устанавливаем свойство Git svn:ignore так, чтобы оно включало это имя файла. Таким образом, оно не показывается как неверсированное при каждой фиксации." #. (title) #: ../source/TortoiseGit_en.xml:3925 @@ -3723,17 +3723,17 @@ msgstr "Иногда бывает полезно создать рабочую #. (para) #: ../source/TortoiseGit_en.xml:3940 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" -"Предположим, вы извлекаете рабочую копию /project1 в D:\\dev\\project1. Выберите папку D:\\dev\\project1, сделайте правый щелчок и выберите Меню WindowsСвойства в контекстном меню. Появится диалог 'Свойства'. Перейдите на вкладку Subversion. Здесь есть кнопка Свойства..., вызывающая диалог работы со свойствами. После появления диалога нажмите кнопку Добавить... и выберите свойство svn:externals из выпадающего списка, после чего введите URL адрес хранилища в формате имя url или, если вы желаете указать конкретную ревизию, имя -rREV url. Вы можете добавить несколько внешних проектов, по одному в строке. Обратите внимание, что некоторые символы в URL должны быть правильно заэкранированы, иначе они не будут правильно работать. Например, вы должны заменить каждый пробел на %20. Обратите внимание: невозможно использование имён папок, содержащих пробелы. Допустим, вы установили это свойство для D:\\dev\\project1: \n" +"Предположим, вы извлекаете рабочую копию /project1 в D:\\dev\\project1. Выберите папку D:\\dev\\project1, сделайте правый щелчок и выберите Меню WindowsСвойства в контекстном меню. Появится диалог 'Свойства'. Перейдите на вкладку Git. Здесь есть кнопка Свойства..., вызывающая диалог работы со свойствами. После появления диалога нажмите кнопку Добавить... и выберите свойство svn:externals из выпадающего списка, после чего введите URL адрес хранилища в формате имя url или, если вы желаете указать конкретную ревизию, имя -rREV url. Вы можете добавить несколько внешних проектов, по одному в строке. Обратите внимание, что некоторые символы в URL должны быть правильно заэкранированы, иначе они не будут правильно работать. Например, вы должны заменить каждый пробел на %20. Обратите внимание: невозможно использование имён папок, содержащих пробелы. Допустим, вы установили это свойство для D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Нажмите на ОК и зафиксируйте ваши изменения. Когда вы (или кто-либо другой) обновите вашу рабочую копию, Subversion создаст подпапку D:\\dev\\project1\\sounds и извлечёт проект sounds, другая подпапка D:\\dev\\project1\\quick graphs будет содержать проект графики, и, наконец, вложенная подпапка D:\\dev\\project1\\skins\\toolkit будет содержать ревизию 21 проекта skin-maker." +" Нажмите на ОК и зафиксируйте ваши изменения. Когда вы (или кто-либо другой) обновите вашу рабочую копию, Git создаст подпапку D:\\dev\\project1\\sounds и извлечёт проект sounds, другая подпапка D:\\dev\\project1\\quick graphs будет содержать проект графики, и, наконец, вложенная подпапка D:\\dev\\project1\\skins\\toolkit будет содержать ревизию 21 проекта skin-maker." #. (para) #: ../source/TortoiseGit_en.xml:3980 @@ -3761,8 +3761,8 @@ msgstr "Если вы используете абсолютные URL в опр #. (para) #: ../source/TortoiseGit_en.xml:4016 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." -msgstr "Во избежание таких проблем, клиенты Subversion, начиная с версии 1.5, поддерживают относительные внешние URL. Реализовано четыре метода указания относительных URL. В следующих примерах предполагается, что у нас есть два хранилища: одно по адресу http://example.com/svn/repos-1 и другое по адресу http://example.com/svn/repos-2. У нас есть извлечено http://example.com/svn/repos-1/project/trunk в C:\\Working и свойство svn:externals установлено для ствола." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgstr "Во избежание таких проблем, клиенты Git, начиная с версии 1.5, поддерживают относительные внешние URL. Реализовано четыре метода указания относительных URL. В следующих примерах предполагается, что у нас есть два хранилища: одно по адресу http://example.com/svn/repos-1 и другое по адресу http://example.com/svn/repos-2. У нас есть извлечено http://example.com/svn/repos-1/project/trunk в C:\\Working и свойство svn:externals установлено для ствола." #. (term) #: ../source/TortoiseGit_en.xml:4031 @@ -3991,8 +3991,8 @@ msgstr "Повторите ту же процедуру для Прое #. (para) #: ../source/TortoiseGit_en.xml:4298 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." -msgstr "Перейдите к Проект76/ПодПроект и сделайте то же самое. На этот раз обратите внимание, что в папке Проект76 нет ничего, кроме ПодПроект, который полностью заполнен. Subversion создала для вас все промежуточные папки, не заполняя их." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." +msgstr "Перейдите к Проект76/ПодПроект и сделайте то же самое. На этот раз обратите внимание, что в папке Проект76 нет ничего, кроме ПодПроект, который полностью заполнен. Git создала для вас все промежуточные папки, не заполняя их." #. (title) #: ../source/TortoiseGit_en.xml:4308 @@ -4001,8 +4001,8 @@ msgstr "Глубина рабочей копии не может быть уме #. (para) #: ../source/TortoiseGit_en.xml:4309 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." -msgstr "После того, как вы извлекли рабочую копию на определённую глубину, вы позже можете увеличить глубину извлечения для получения дополнительного содержимого. Однако, вы не можете уменьшить эту глубину, чтобы убрать лишнее содержимое. Возможно, эта возможность будет добавлена в более позних версиях Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." +msgstr "После того, как вы извлекли рабочую копию на определённую глубину, вы позже можете увеличить глубину извлечения для получения дополнительного содержимого. Однако, вы не можете уменьшить эту глубину, чтобы убрать лишнее содержимое. Возможно, эта возможность будет добавлена в более позних версиях Git." #. (title) #: ../source/TortoiseGit_en.xml:4317 @@ -4120,7 +4120,7 @@ msgstr "добавить файл (или шаблон его имени) в с #. (para) #: ../source/TortoiseGit_en.xml:4457 msgid "add the file to the svn:ignore list using TortoiseGitAdd to ignore list This will only affect the directory on which you set the svn:ignore property. Using the SVN Property Dialog, you can alter the svn:ignore property for a directory." -msgstr "добавить файл в список svn:ignore, используя TortoiseGitДобавить в список игнорирования. Это затронет только папку, для которой вы устанавливаете свойство svn:ignore. Вы можете изменить свойство svn:ignore для папки при помощи диалога свойств Subversion." +msgstr "добавить файл в список svn:ignore, используя TortoiseGitДобавить в список игнорирования. Это затронет только папку, для которой вы устанавливаете свойство svn:ignore. Вы можете изменить свойство svn:ignore для папки при помощи диалога свойств Git." #. (para) #: ../source/TortoiseGit_en.xml:4444 @@ -4144,8 +4144,8 @@ msgstr "Отображаемые в нижней панели столбцы м #. (para) #: ../source/TortoiseGit_en.xml:4495 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." -msgstr "По умолчанию, при фиксации изменений все удерживаемые вами блокировки файлов снимаются после успешного завершения операции. Если вы желаете оставить эти блокировки, убедитесь, что флажок Сохранить блокировки отмечен. Значение, используемое по умолчанию для этого флажка, берётся из параметра no_unlock конфигурационного файла Subversion. Прочтите , чтобы узнать, как редактировать конфигурационный файл Subversion." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." +msgstr "По умолчанию, при фиксации изменений все удерживаемые вами блокировки файлов снимаются после успешного завершения операции. Если вы желаете оставить эти блокировки, убедитесь, что флажок Сохранить блокировки отмечен. Значение, используемое по умолчанию для этого флажка, берётся из параметра no_unlock конфигурационного файла Git. Прочтите , чтобы узнать, как редактировать конфигурационный файл Git." #. (para) #: ../source/TortoiseGit_en.xml:4506 @@ -4168,8 +4168,8 @@ msgstr "Исправление внешних переименований" #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5337 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Иногда файлы переименовываются вне Subversion, и тогда в списке файлов каждый из них присутствует как два: один отсутствующий, другой - неверсированный. Чтобы избежать потери истории файла, необходимо известить Subversion о том, что они связаны. Просто выберите оба файла: и со старым именем (отсутствующий), и с новым именем (неверсированный) и выполните Контекстное менюПоправить переименование, чтобы обозначить эту пару файлов как переименование." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Иногда файлы переименовываются вне Git, и тогда в списке файлов каждый из них присутствует как два: один отсутствующий, другой - неверсированный. Чтобы избежать потери истории файла, необходимо известить Git о том, что они связаны. Просто выберите оба файла: и со старым именем (отсутствующий), и с новым именем (неверсированный) и выполните Контекстное менюПоправить переименование, чтобы обозначить эту пару файлов как переименование." #. (title) #. (title) @@ -4180,8 +4180,8 @@ msgstr "Группы изменений" #. (para) #: ../source/TortoiseGit_en.xml:4539 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." -msgstr "Диалог фиксации поддерживает группы изменений Subversion, предназначенных для группировки связанных файлов. Об этой возможности рассказывает ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." +msgstr "Диалог фиксации поддерживает группы изменений Git, предназначенных для группировки связанных файлов. Об этой возможности рассказывает ." #. (title) #: ../source/TortoiseGit_en.xml:4546 @@ -4465,8 +4465,8 @@ msgstr "Локальный файл уже существует" #. (para) #: ../source/TortoiseGit_en.xml:4881 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." -msgstr "Иногда попытка обновления завершается неудачей с сообщением о существовании локального файла с таким же именем. Это обычно происходит, когда Subversion пытается извлечь новый версированный файл, и обнаруживает, что неверсированный файл с таким именем уже существует в вашей рабочей папке. Subversion никогда не перезапишет неверсированный файл - он может содержать что-либо, над чем вы работаете, и по стечению обстоятельств называться также, как и файл, недавно зафиксированный другим разработчиком." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgstr "Иногда попытка обновления завершается неудачей с сообщением о существовании локального файла с таким же именем. Это обычно происходит, когда Git пытается извлечь новый версированный файл, и обнаруживает, что неверсированный файл с таким именем уже существует в вашей рабочей папке. Git никогда не перезапишет неверсированный файл - он может содержать что-либо, над чем вы работаете, и по стечению обстоятельств называться также, как и файл, недавно зафиксированный другим разработчиком." #. (para) #: ../source/TortoiseGit_en.xml:4890 @@ -4516,27 +4516,27 @@ msgstr "filename.ext.rНОВАЯ_РЕВИЗИЯ" #. (para) #: ../source/TortoiseGit_en.xml:4960 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." -msgstr "Это файл, который был получен с сервера клиентом Subversion при обновлении вашей рабочей копии. Этот файл соответствует ведущей (HEAD) ревизии хранилища." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgstr "Это файл, который был получен с сервера клиентом Git при обновлении вашей рабочей копии. Этот файл соответствует ведущей (HEAD) ревизии хранилища." #. (para) #: ../source/TortoiseGit_en.xml:4915 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" -"Когда-нибудь вы получите конфликт при обновлении ваших файлов из хранилища. Конфликт возникает, когда двое или более разработчиков изменили одни и те же строки файла. Поскольку Subversion ничего не знает о вашем проекте, она оставляет улаживание конфликта за разработчиками. При возникновении конфликта вам надо открыть данный файл, и найти строки, начинающиеся с символов <<<<<<<. Область конфликта помечена следующим образом: \n" +"Когда-нибудь вы получите конфликт при обновлении ваших файлов из хранилища. Конфликт возникает, когда двое или более разработчиков изменили одни и те же строки файла. Поскольку Git ничего не знает о вашем проекте, она оставляет улаживание конфликта за разработчиками. При возникновении конфликта вам надо открыть данный файл, и найти строки, начинающиеся с символов <<<<<<<. Область конфликта помечена следующим образом: \n" "<<<<<<< filename\n" " ваши изменения\n" "=======\n" " код из хранилища\n" ">>>>>>> revision\n" -" Кроме того, для каждого файла с конфликтом Subversion помещает в ту же папку три дополнительных файла: " +" Кроме того, для каждого файла с конфликтом Git помещает в ту же папку три дополнительных файла: " #. (para) #: ../source/TortoiseGit_en.xml:4970 @@ -4550,8 +4550,8 @@ msgstr "После этого выполните команду filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." -msgstr "Если конфликты возникли в двоичных файлах, Subversion не пытается самостоятельно слить эти файлы. Локальный файл остаётся неизменённым (точно таким, как при последнем вашем изменении) и у вас есть файлы filename.ext.r*. Если вы хотите отменить ваши изменения, и сохранить версию из хранилища, используйте команду 'Убрать изменения'. Если вы хотите сохранить вашу версию и переписать версию в хранилище, используйте команду 'Улажено', после чего зафиксируйте вашу версию." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgstr "Если конфликты возникли в двоичных файлах, Git не пытается самостоятельно слить эти файлы. Локальный файл остаётся неизменённым (точно таким, как при последнем вашем изменении) и у вас есть файлы filename.ext.r*. Если вы хотите отменить ваши изменения, и сохранить версию из хранилища, используйте команду 'Убрать изменения'. Если вы хотите сохранить вашу версию и переписать версию в хранилище, используйте команду 'Улажено', после чего зафиксируйте вашу версию." #. (para) #: ../source/TortoiseGit_en.xml:5004 @@ -4600,13 +4600,13 @@ msgstr "значки" #. (para) #: ../source/TortoiseGit_en.xml:5046 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "Теперь, после извлечения рабочей копии из хранилища Subversion, вы можете заметить, что значки в Проводнике Windows немного изменились, и это одна из причин такой популярности TortoiseGit. TortoiseGit добавляет так называемую пометку на значке для каждого файла, которая накладывается на исходный значок файла. Пометки различаются и зависят от статуса файла в Subversion." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." +msgstr "Теперь, после извлечения рабочей копии из хранилища Git, вы можете заметить, что значки в Проводнике Windows немного изменились, и это одна из причин такой популярности TortoiseGit. TortoiseGit добавляет так называемую пометку на значке для каждого файла, которая накладывается на исходный значок файла. Пометки различаются и зависят от статуса файла в Git." #. (para) #: ../source/TortoiseGit_en.xml:5054 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " В свежеизвлечённой рабочей копии все пометки выглядят как зеленая галочка. Это означает, что статус Subversion - нормальный." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " В свежеизвлечённой рабочей копии все пометки выглядят как зеленая галочка. Это означает, что статус Git - нормальный." #. (para) #: ../source/TortoiseGit_en.xml:5059 @@ -4620,13 +4620,13 @@ msgstr " Если в проце #. (para) #: ../source/TortoiseGit_en.xml:5072 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." -msgstr " Если вы установили для файла свойство svn:needs-lock, Subversion помечает этот файл как доступный только для чтения, пока вы не получите блокировку для этого файла. Эта пометка на файлах означает, что вы должны заблокировать файл перед тем, как начнёте его редактировать." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgstr " Если вы установили для файла свойство svn:needs-lock, Git помечает этот файл как доступный только для чтения, пока вы не получите блокировку для этого файла. Эта пометка на файлах означает, что вы должны заблокировать файл перед тем, как начнёте его редактировать." #. (para) #: ../source/TortoiseGit_en.xml:5079 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." -msgstr " Если вы владеете блокировкой на файл, и его статус в Subversion нормальный, эта пометка напомнит вам, что вы должны разблокировать файл, если вы его не используете, чтобы и другие могли зафиксировать свои изменения в этом файле." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgstr " Если вы владеете блокировкой на файл, и его статус в Git нормальный, эта пометка напомнит вам, что вы должны разблокировать файл, если вы его не используете, чтобы и другие могли зафиксировать свои изменения в этом файле." #. (para) #: ../source/TortoiseGit_en.xml:5086 @@ -4661,8 +4661,8 @@ msgstr "Теперь, с появлением всё большего числа #. (para) #: ../source/TortoiseGit_en.xml:5124 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." -msgstr "Для описания соответствия пометок на значках статусам Subversion и других технических подробностей, прочтите ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." +msgstr "Для описания соответствия пометок на значках статусам Git и других технических подробностей, прочтите ." #. (title) #: ../source/TortoiseGit_en.xml:5131 @@ -5099,8 +5099,8 @@ msgstr "Скопировать в буфер обмена подробности #. (para) #: ../source/TortoiseGit_en.xml:5742 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." -msgstr "Найти сообщения журнала, содержащие введённый вами текст. Поиск будет производиться в введённых сообщениях, а также в сводке выполненных действий, создаваемой Subversion (отображаемой в нижней панели). Поиск не зависит от регистра." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." +msgstr "Найти сообщения журнала, содержащие введённый вами текст. Поиск будет производиться в введённых сообщениях, а также в сводке выполненных действий, создаваемой Git (отображаемой в нижней панели). Поиск не зависит от регистра." #. (para) #: ../source/TortoiseGit_en.xml:5581 @@ -5186,8 +5186,8 @@ msgstr "Отменить изменения, сделанные в выделе #. (para) #: ../source/TortoiseGit_en.xml:5843 -msgid "View the Subversion properties for the selected item." -msgstr "Посмотреть свойства Subversion для выбранных элементов." +msgid "View the Git properties for the selected item." +msgstr "Посмотреть свойства Git для выбранных элементов." #. (para) #: ../source/TortoiseGit_en.xml:5848 @@ -5211,18 +5211,18 @@ msgstr "Вы можете заметить, что иногда мы упоми #. (para) #: ../source/TortoiseGit_en.xml:5865 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." -msgstr "Номера ревизий в Subversion используются для обозначения двух различных вещей: обычно ревизия представляет состояние хранилища в определённый момент времени, но также может использоваться для обозначения набора изменений при помощи которого была создана эта ревизия, например Сделано в ревизии 1234 означает, что изменения, зафиксированные в r1234, реализуют возможность Х. Для того, чтобы было понятнее, какое из значений используется, мы применяем два различных термина." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgstr "Номера ревизий в Git используются для обозначения двух различных вещей: обычно ревизия представляет состояние хранилища в определённый момент времени, но также может использоваться для обозначения набора изменений при помощи которого была создана эта ревизия, например Сделано в ревизии 1234 означает, что изменения, зафиксированные в r1234, реализуют возможность Х. Для того, чтобы было понятнее, какое из значений используется, мы применяем два различных термина." #. (para) #: ../source/TortoiseGit_en.xml:5874 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." -msgstr "Если выбрать две ревизии, N и M, в контекстном меню будет предложено показать различия между двумя этими ревизиями. В терминах Subversion это diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." +msgstr "Если выбрать две ревизии, N и M, в контекстном меню будет предложено показать различия между двумя этими ревизиями. В терминах Git это diff -r M:N." #. (para) #: ../source/TortoiseGit_en.xml:5880 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." -msgstr "Если выбрать единственную ревизию N, в контекстном меню будет предложено показать изменения, сделанные в этой ревизии. В терминах Subversion это diff -r N-1:N или diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." +msgstr "Если выбрать единственную ревизию N, в контекстном меню будет предложено показать изменения, сделанные в этой ревизии. В терминах Git это diff -r N-1:N или diff -c N." #. (para) #: ../source/TortoiseGit_en.xml:5886 @@ -5256,8 +5256,8 @@ msgstr "Когда окно журнала вызывается из диало #. (para) #: ../source/TortoiseGit_en.xml:5935 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." -msgstr "Обратите внимание, сейчас Subversion реализует переименование как пару копирование/удаление, так что переименование файла или папки также останавливает отображение журнала в случае, если установлен этот флажок." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgstr "Обратите внимание, сейчас Git реализует переименование как пару копирование/удаление, так что переименование файла или папки также останавливает отображение журнала в случае, если установлен этот флажок." #. (para) #: ../source/TortoiseGit_en.xml:5894 @@ -5311,8 +5311,8 @@ msgstr "журнал отслеживания слияний" #. (para) #: ../source/TortoiseGit_en.xml:5990 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." -msgstr "В Subversion версий 1.5 и больше слияния регистрируются при помощи свойств. Это позволяет нам получить более подробную историю слитых изменений. Например, если вы разработали новую возможность в ответвлении и потом произвели слияние этого ответвления обратно в ствол, разработка этой возможности будет показана в журнале ствола как единственная фиксация для слияния, даже если в ответвлении было произведено 1000 фиксаций во время разработки." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgstr "В Git версий 1.5 и больше слияния регистрируются при помощи свойств. Это позволяет нам получить более подробную историю слитых изменений. Например, если вы разработали новую возможность в ответвлении и потом произвели слияние этого ответвления обратно в ствол, разработка этой возможности будет показана в журнале ствола как единственная фиксация для слияния, даже если в ответвлении было произведено 1000 фиксаций во время разработки." #. (title) #: ../source/TortoiseGit_en.xml:5999 @@ -5346,8 +5346,8 @@ msgstr "Иногда вы можете пожелать изменить вве #. (para) #: ../source/TortoiseGit_en.xml:6031 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." -msgstr "Subversion позволяет изменять как сообщение журнала, так и автора ревизии в любое удобное для вас время. Но, поскольку такие изменения не могут быть отменены (эти изменения не версируются), эта возможность по умолчанию отключена. Для того, чтобы её включить, вы должны установить ловушку pre-revprop-change (перед-изменением-свойства_ревизии). Пожалуйста, за подробным описанием того, как это сделать, обратитесь к главе Hook Scripts (Скрипты ловушек) в Книге о Subversion. Прочтите , в котором содержатся несколько дополнительных заметок о реализации ловушек на машине с Windows." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgstr "Git позволяет изменять как сообщение журнала, так и автора ревизии в любое удобное для вас время. Но, поскольку такие изменения не могут быть отменены (эти изменения не версируются), эта возможность по умолчанию отключена. Для того, чтобы её включить, вы должны установить ловушку pre-revprop-change (перед-изменением-свойства_ревизии). Пожалуйста, за подробным описанием того, как это сделать, обратитесь к главе Hook Scripts (Скрипты ловушек) в Книге о Git. Прочтите , в котором содержатся несколько дополнительных заметок о реализации ловушек на машине с Windows." #. (para) #: ../source/TortoiseGit_en.xml:6044 @@ -5356,8 +5356,8 @@ msgstr "После того, как вы настроили на сервере #. (para) #: ../source/TortoiseGit_en.xml:6051 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." -msgstr "Из-за того, что свойства ревизий в Subversion не версируются, изменение таких свойств (например, свойства svn:log - сообщение журнала при фиксации) будет перезаписывать предыдущее значение этого свойства навсегда." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgstr "Из-за того, что свойства ревизий в Git не версируются, изменение таких свойств (например, свойства svn:log - сообщение журнала при фиксации) будет перезаписывать предыдущее значение этого свойства навсегда." #. (title) #: ../source/TortoiseGit_en.xml:6061 @@ -5616,8 +5616,8 @@ msgstr "Различия между файлом/папкой в рабочей #. (para) #: ../source/TortoiseGit_en.xml:6373 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." -msgstr "Если вы желаете посмотреть различия между файлом из вашей рабочей копии и файлом в каком-нибудь хранилище Subversion, то это можно сделать прямо в Проводнике, выделив этот файл и вызвав контекстное меню, удерживая клавишу Shift, после чего выбрав TortoiseGitРазличия с файлом по URL. Это же можно сделать и для папки в рабочей копии. TortoiseMerge показывает эти различия также, как показывает файл заплаток - в виде списка изменённых файлов, которые можно просматривать по одному за раз." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgstr "Если вы желаете посмотреть различия между файлом из вашей рабочей копии и файлом в каком-нибудь хранилище Git, то это можно сделать прямо в Проводнике, выделив этот файл и вызвав контекстное меню, удерживая клавишу Shift, после чего выбрав TortoiseGitРазличия с файлом по URL. Это же можно сделать и для папки в рабочей копии. TortoiseMerge показывает эти различия также, как показывает файл заплаток - в виде списка изменённых файлов, которые можно просматривать по одному за раз." #. (term) #: ../source/TortoiseGit_en.xml:6391 @@ -6013,8 +6013,8 @@ msgstr "метка" #. (para) #: ../source/TortoiseGit_en.xml:6817 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." -msgstr "Часто случается, что у вас уже есть файлы, необходимые также в другом вашем проекте в том же хранилище, и вы просто хотите скопировать их туда. Конечно, вы можете просто скопировать файлы и добавить их как описано выше, но этот способ не перенесёт истории изменений. И если вы в последующем исправите ошибку в исходных файлах, вы сможете слить исправление автоматически только если новая копия связана в Subversion с исходным файлом." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." +msgstr "Часто случается, что у вас уже есть файлы, необходимые также в другом вашем проекте в том же хранилище, и вы просто хотите скопировать их туда. Конечно, вы можете просто скопировать файлы и добавить их как описано выше, но этот способ не перенесёт истории изменений. И если вы в последующем исправите ошибку в исходных файлах, вы сможете слить исправление автоматически только если новая копия связана в Git с исходным файлом." #. (para) #: ../source/TortoiseGit_en.xml:6825 @@ -6099,8 +6099,8 @@ msgstr "Глобальный список игнорирования" #. (para) #: ../source/TortoiseGit_en.xml:6949 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." -msgstr "Другой путь игнорирования файлов - добавить их в глобальный список игнорирования. В этом случае самое большое отличие в том, что глобальный список игнорирования - это клиентское свойство. Оно применяется ко всем проектам Subversion, но только на этом клиентском компьютере. В общем случае, лучше использовать свойство svn:ignore когда возможно, так как оно может быть применено к конкретным разделам проекта, и оно работает для всех извлекающих этот проект. Более подробную информацию смотрите в ." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgstr "Другой путь игнорирования файлов - добавить их в глобальный список игнорирования. В этом случае самое большое отличие в том, что глобальный список игнорирования - это клиентское свойство. Оно применяется ко всем проектам Git, но только на этом клиентском компьютере. В общем случае, лучше использовать свойство svn:ignore когда возможно, так как оно может быть применено к конкретным разделам проекта, и оно работает для всех извлекающих этот проект. Более подробную информацию смотрите в ." #. (title) #: ../source/TortoiseGit_en.xml:6962 @@ -6109,8 +6109,8 @@ msgstr "Игнорирование версированных файлов и п #. (para) #: ../source/TortoiseGit_en.xml:6963 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." -msgstr "Версированные файлы и папки не могут игнорироваться - так устроена Subversion. Если вы версировали файл по ошибке, прочтите , где приведены инструкции, как сделать его неверсированным." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." +msgstr "Версированные файлы и папки не могут игнорироваться - так устроена Git. Если вы версировали файл по ошибке, прочтите , где приведены инструкции, как сделать его неверсированным." #. (title) #: ../source/TortoiseGit_en.xml:6971 @@ -6159,8 +6159,8 @@ msgstr "Соответствует любому символу, заключён #. (para) #: ../source/TortoiseGit_en.xml:6978 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " -msgstr "Шаблоны игнорирования в Subversion применяют универсализацию имён файлов - способ, первоначально задействованный в Unix для указания нужных файлов и использующий мета-символы для обобщения. Следующие символы имеют специальное значение: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgstr "Шаблоны игнорирования в Git применяют универсализацию имён файлов - способ, первоначально задействованный в Unix для указания нужных файлов и использующий мета-символы для обобщения. Следующие символы имеют специальное значение: " #. (para) #: ../source/TortoiseGit_en.xml:7018 @@ -6195,8 +6195,8 @@ msgstr "Контекстное меню Проводника для версир #. (para) #: ../source/TortoiseGit_en.xml:7053 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " -msgstr "В отличие от CVS, Subversion позволяет переименовывать и перемешать файлы и папки. Поэтому в подменю TortoiseGit есть специальные пункты для удаления и переименования. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgstr "В отличие от CVS, Git позволяет переименовывать и перемешать файлы и папки. Поэтому в подменю TortoiseGit есть специальные пункты для удаления и переименования. " #. (title) #: ../source/TortoiseGit_en.xml:7063 @@ -6215,8 +6215,8 @@ msgstr "удаление" #. (para) #: ../source/TortoiseGit_en.xml:7070 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." -msgstr "Для удаления файлов и папок из Subversion применяется команда TortoiseGitУдалить." +msgid "Use TortoiseGitDelete to remove files or folders from Git." +msgstr "Для удаления файлов и папок из Git применяется команда TortoiseGitУдалить." #. (para) #: ../source/TortoiseGit_en.xml:7078 @@ -6225,8 +6225,8 @@ msgstr "Когда вы решаете TortoiseGitTortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." -msgstr "Когда вы решаете TortoiseGitУдалить папку, она остаётся в рабочей копии, но пометка на ней изменяется, обозначая, что она будет удалена. До тех пор, пока не произведена фиксация, вы можете вернуть папку обратно, если вызовете TortoiseGitУбрать изменения на самой этой папке. За эту разницу в работе с файлами и папками ответственна Subversion, а не TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." +msgstr "Когда вы решаете TortoiseGitУдалить папку, она остаётся в рабочей копии, но пометка на ней изменяется, обозначая, что она будет удалена. До тех пор, пока не произведена фиксация, вы можете вернуть папку обратно, если вызовете TortoiseGitУбрать изменения на самой этой папке. За эту разницу в работе с файлами и папками ответственна Git, а не TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:7111 @@ -6235,13 +6235,13 @@ msgstr "Если вы желаете удалить какой-нибудь об #. (para) #: ../source/TortoiseGit_en.xml:7122 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." -msgstr "Если файл удаляется в Проводнике, а не при помощи контекстного меню TortoiseGit, диалог фиксации отобразит этот файл и позволит вам удалить его также из под управления версиями перед фиксацией. Однако, если вы обновите вашу рабочую копию, Subversion обнаружит отсутствующий файл и заменит его последней версией из хранилища. Если вам необходимо удалить файл, находящийся под управлением версиями, всегда используйте TortoiseGitУдалить, чтобы Subversion не приходилось угадывать, что вы хотите сделать на самом деле." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." +msgstr "Если файл удаляется в Проводнике, а не при помощи контекстного меню TortoiseGit, диалог фиксации отобразит этот файл и позволит вам удалить его также из под управления версиями перед фиксацией. Однако, если вы обновите вашу рабочую копию, Git обнаружит отсутствующий файл и заменит его последней версией из хранилища. Если вам необходимо удалить файл, находящийся под управлением версиями, всегда используйте TortoiseGitУдалить, чтобы Git не приходилось угадывать, что вы хотите сделать на самом деле." #. (para) #: ../source/TortoiseGit_en.xml:7136 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." -msgstr "Если папка удаляется в Проводнике, а не при помощи контекстного меню TortoiseGit, ваша рабочая копия будет повреждена и вы не сможете фиксировать изменения. Если вы обновите вашу рабочую копию, Subversion заменит отсутствующие папки их последними версиями из хранилища, и после этого вы сможете удалить их правильно, используя TortoiseGitУдалить." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgstr "Если папка удаляется в Проводнике, а не при помощи контекстного меню TortoiseGit, ваша рабочая копия будет повреждена и вы не сможете фиксировать изменения. Если вы обновите вашу рабочую копию, Git заменит отсутствующие папки их последними версиями из хранилища, и после этого вы сможете удалить их правильно, используя TortoiseGitУдалить." #. (title) #: ../source/TortoiseGit_en.xml:7149 @@ -6335,13 +6335,13 @@ msgstr "изменение регистра" #. (para) #: ../source/TortoiseGit_en.xml:7265 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." -msgstr "Изменение только регистра символов в имени файла при помощи Subversion под Windows требует применения хитрости, поскольку во время переименования на короткое время должны существовать оба имени. А так как файловая система Windows нечувствительна к регистру, это не сработает при использовании обычной команды переименования." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgstr "Изменение только регистра символов в имени файла при помощи Git под Windows требует применения хитрости, поскольку во время переименования на короткое время должны существовать оба имени. А так как файловая система Windows нечувствительна к регистру, это не сработает при использовании обычной команды переименования." #. (para) #: ../source/TortoiseGit_en.xml:7271 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" -msgstr "К счастью, существует (по крайней мере) два возможных способа переименования файла без потери его истории изменений. Важно переименовать его при помощи Subversion. Простое переименование в Проводнике испортит вашу рабочую копию!!!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" +msgstr "К счастью, существует (по крайней мере) два возможных способа переименования файла без потери его истории изменений. Важно переименовать его при помощи Git. Простое переименование в Проводнике испортит вашу рабочую копию!!!" #. (para) #: ../source/TortoiseGit_en.xml:7281 @@ -6392,8 +6392,8 @@ msgstr "Как справиться с конфликтами из-за реги #. (para) #: ../source/TortoiseGit_en.xml:7327 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." -msgstr "В случае, когда у вас в хранилище есть два файла с одинаковыми именами, различающиеся только регистром (например, TEST.TXT и test.txt), вы больше не сможете обновить или извлечь папку, содержащую эти файлы, при помощи клиента под Windows. Хотя Subversion и поддерживает имена файлов, различающиеся регистром, их не поддерживает Windows." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." +msgstr "В случае, когда у вас в хранилище есть два файла с одинаковыми именами, различающиеся только регистром (например, TEST.TXT и test.txt), вы больше не сможете обновить или извлечь папку, содержащую эти файлы, при помощи клиента под Windows. Хотя Git и поддерживает имена файлов, различающиеся регистром, их не поддерживает Windows." #. (para) #: ../source/TortoiseGit_en.xml:7335 @@ -6422,13 +6422,13 @@ msgstr "Исправление переименования файлов" #. (para) #: ../source/TortoiseGit_en.xml:7359 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." -msgstr "Иногда ваша дружественная IDE переименовывает для вас файлы в процессе осуществления рефакторинга, и, конечно же, не сообщает об этом Subversion. При попытке зафиксировать изменения, Subversion будет видеть файл со старым именем как отсутствующий, а с новым - как неверсированный. Конечно, вы можете пометить новое имя для того, чтобы оно было добавлено, но тогда будет потеряна история изменений, поскольку Subversion не знает о взаимосвязи двух этих файлов." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." +msgstr "Иногда ваша дружественная IDE переименовывает для вас файлы в процессе осуществления рефакторинга, и, конечно же, не сообщает об этом Git. При попытке зафиксировать изменения, Git будет видеть файл со старым именем как отсутствующий, а с новым - как неверсированный. Конечно, вы можете пометить новое имя для того, чтобы оно было добавлено, но тогда будет потеряна история изменений, поскольку Git не знает о взаимосвязи двух этих файлов." #. (para) #: ../source/TortoiseGit_en.xml:7367 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Лучший способ - сообщить Subversion о том, что это изменение - на самом деле переименование, и это можно сделать и в диалоге Фиксация, и в диалоге Проверка на наличие изменений. Просто выделите оба имени: старое имя (отсутствующее) и новое имя (неверсированное), и примените Контекстное менюПоправить переименование для обозначения этой пары в качестве переименования." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Лучший способ - сообщить Git о том, что это изменение - на самом деле переименование, и это можно сделать и в диалоге Фиксация, и в диалоге Проверка на наличие изменений. Просто выделите оба имени: старое имя (отсутствующее) и новое имя (неверсированное), и примените Контекстное менюПоправить переименование для обозначения этой пары в качестве переименования." #. (title) #: ../source/TortoiseGit_en.xml:7381 @@ -6437,8 +6437,8 @@ msgstr "Удаление неверсированных файлов" #. (para) #: ../source/TortoiseGit_en.xml:7382 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." -msgstr "Обычно ваш список игнорирования настроен так, чтобы Subversion игнорировала все генерируемые файлы. Но что, если вы желаете очистить все эти игнорируемые элементы для порождения чистой сборки? Как правило, вы настраиваете это в вашем сборочном файле, но если вы отлаживаете сборочный файл, или изменяете систему сборки, полезно иметь способ очистки места действия." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgstr "Обычно ваш список игнорирования настроен так, чтобы Git игнорировала все генерируемые файлы. Но что, если вы желаете очистить все эти игнорируемые элементы для порождения чистой сборки? Как правило, вы настраиваете это в вашем сборочном файле, но если вы отлаживаете сборочный файл, или изменяете систему сборки, полезно иметь способ очистки места действия." #. (para) #: ../source/TortoiseGit_en.xml:7389 @@ -6534,13 +6534,13 @@ msgstr "очистка" #. (para) #: ../source/TortoiseGit_en.xml:7484 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." -msgstr "Если команда Subversion не может быть успешно завершена, возможно из-за проблем с сервером, ваша рабочая копия может остаться в несогласованном состоянии. В этом случае вам необходимо выполнить команду TortoiseGitОчистка для этой папки. Хорошей идеей будет выполнить эту команду также для папки самого верхнего уровня вашей рабочей копии." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgstr "Если команда Git не может быть успешно завершена, возможно из-за проблем с сервером, ваша рабочая копия может остаться в несогласованном состоянии. В этом случае вам необходимо выполнить команду TortoiseGitОчистка для этой папки. Хорошей идеей будет выполнить эту команду также для папки самого верхнего уровня вашей рабочей копии." #. (para) #: ../source/TortoiseGit_en.xml:7495 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." -msgstr "Очистка имеет и другой полезный побочный эффект: если дата файла изменилась, а его содержимое - нет, Subversion не сможет сказать, был ли он в действительности изменён, кроме как выполнив побайтовое сравнение с нетронутой копией. Если у вас множество файлов в таком состоянии, это может привести к очень медленному получению статуса, которое, в свою очередь, вызывает замедление работы множества диалогов. Выполнение 'Очистки' на вашей рабочей копии исправит эти нарушенные отметки даты-времени и восстановит максимальную скорость проверки статуса." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgstr "Очистка имеет и другой полезный побочный эффект: если дата файла изменилась, а его содержимое - нет, Git не сможет сказать, был ли он в действительности изменён, кроме как выполнив побайтовое сравнение с нетронутой копией. Если у вас множество файлов в таком состоянии, это может привести к очень медленному получению статуса, которое, в свою очередь, вызывает замедление работы множества диалогов. Выполнение 'Очистки' на вашей рабочей копии исправит эти нарушенные отметки даты-времени и восстановит максимальную скорость проверки статуса." #. (title) #: ../source/TortoiseGit_en.xml:7506 @@ -6549,8 +6549,8 @@ msgstr "Использовать дату-время фиксации" #. (para) #: ../source/TortoiseGit_en.xml:7507 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." -msgstr "В некоторых ранних выпусках Subversion существовала ошибка, вызывавшая несоответствие временной метки при извлечении с установленным флажком Использовать дату-время фиксации. Используйте команду 'Очистить' для увеличения скорости работы с такими рабочими копиями." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgstr "В некоторых ранних выпусках Git существовала ошибка, вызывавшая несоответствие временной метки при извлечении с установленным флажком Использовать дату-время фиксации. Используйте команду 'Очистить' для увеличения скорости работы с такими рабочими копиями." # ---- 5.16 #. (title) @@ -6565,40 +6565,40 @@ msgstr "свойства" #. (title) #: ../source/TortoiseGit_en.xml:7523 -msgid "Explorer property page, Subversion tab" -msgstr "Страница свойств Проводника, вкладка Subversion" +msgid "Explorer property page, Git tab" +msgstr "Страница свойств Проводника, вкладка Git" #. (para) #: ../source/TortoiseGit_en.xml:7521 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." -msgstr " Иногда вам необходима более детальная информация о файле/папке, нежели пометка на значке. Вы можете получить всю информацию, предоставляемую Subversion, в диалоге свойств Проводника. Просто выберите из контекстного меню для нужного файла или папки Меню WindowsСвойства (обратите внимание: это обычный пункт 'Свойства' в контекстном меню Проводника, а не тот, который в подменю TortoiseGit!). В диалоге свойств TortoiseGit добавляет новую вкладку свойств для файлов/папок, находящихся под управлением Subversion, где вы можете посмотреть всю существенную информацию о выбранном файле/папке." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." +msgstr " Иногда вам необходима более детальная информация о файле/папке, нежели пометка на значке. Вы можете получить всю информацию, предоставляемую Git, в диалоге свойств Проводника. Просто выберите из контекстного меню для нужного файла или папки Меню WindowsСвойства (обратите внимание: это обычный пункт 'Свойства' в контекстном меню Проводника, а не тот, который в подменю TortoiseGit!). В диалоге свойств TortoiseGit добавляет новую вкладку свойств для файлов/папок, находящихся под управлением Git, где вы можете посмотреть всю существенную информацию о выбранном файле/папке." #. (title) #: ../source/TortoiseGit_en.xml:7543 -msgid "Subversion Properties" -msgstr "Свойства Subversion" +msgid "Git Properties" +msgstr "Свойства Git" #. (primary) #: ../source/TortoiseGit_en.xml:7545 -msgid "Subversion properties" -msgstr "свойства Subversion" +msgid "Git properties" +msgstr "свойства Git" #. (title) #: ../source/TortoiseGit_en.xml:7551 -msgid "Subversion property page" -msgstr "Страница свойств Subversion" +msgid "Git property page" +msgstr "Страница свойств Git" # !!! оригинал не совсем соответствует действительности #. (para) #: ../source/TortoiseGit_en.xml:7549 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." -msgstr " Вы можете вызвать диалог для просмотра и установки свойств Subversion не только из диалога свойств Проводника Windows, но и также из TortoiseGitСвойства, и из списков состояния в различных диалогах TortoiseGit, при помощи Контекстное менюСвойства." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgstr " Вы можете вызвать диалог для просмотра и установки свойств Git не только из диалога свойств Проводника Windows, но и также из TortoiseGitСвойства, и из списков состояния в различных диалогах TortoiseGit, при помощи Контекстное менюСвойства." # !!! externals #. (para) #: ../source/TortoiseGit_en.xml:7566 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." -msgstr "Вы можете добавить ваши собственные свойства, а также некоторые свойства, имеющие специальное значение в Subversion. Такие свойства начинаются с svn:. Одним из таких свойств является svn:externals; посмотреть, как обращаться с внешними включениями, можно в ." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgstr "Вы можете добавить ваши собственные свойства, а также некоторые свойства, имеющие специальное значение в Git. Такие свойства начинаются с svn:. Одним из таких свойств является svn:externals; посмотреть, как обращаться с внешними включениями, можно в ." #. (title) #: ../source/TortoiseGit_en.xml:7573 @@ -6642,18 +6642,18 @@ msgstr "Сжатое сочетание предыдущих четырёх кл #. (para) #: ../source/TortoiseGit_en.xml:7580 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " -msgstr "Subversion поддерживает подстановку ключевых слов в стиле CVS, для внесения имени файла и информации о ревизии внутрь самого этого файла. Ключевые слова, поддерживаемые в данный момент: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgstr "Git поддерживает подстановку ключевых слов в стиле CVS, для внесения имени файла и информации о ревизии внутрь самого этого файла. Ключевые слова, поддерживаемые в данный момент: " #. (para) #: ../source/TortoiseGit_en.xml:7631 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." -msgstr "Чтобы узнать, как использовать эти ключевые слова, взгляните на svn:keywords section (раздел о svn:keywords) в Книге о Subversion, в котором приведено полное описание этих ключевых слов, и также информация о том, как их задействовать и как использовать." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." +msgstr "Чтобы узнать, как использовать эти ключевые слова, взгляните на svn:keywords section (раздел о svn:keywords) в Книге о Git, в котором приведено полное описание этих ключевых слов, и также информация о том, как их задействовать и как использовать." #. (para) #: ../source/TortoiseGit_en.xml:7641 -msgid "For more information about properties in Subversion see the Special Properties." -msgstr "Чтобы больше узнать о свойствах в Subversion, прочтите Special Properties (Специальные свойства)." +msgid "For more information about properties in Git see the Special Properties." +msgstr "Чтобы больше узнать о свойствах в Git, прочтите Special Properties (Специальные свойства)." #. (title) #: ../source/TortoiseGit_en.xml:7648 @@ -6757,13 +6757,13 @@ msgstr "автосвойства" #. (para) #: ../source/TortoiseGit_en.xml:7759 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." -msgstr "Вы можете настроить Subversion и TortoiseGit так, чтобы при добавлении файлов и папок в хранилище свойства для них устанавливались бы автоматически. Есть два способа это сделать:" +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgstr "Вы можете настроить Git и TortoiseGit так, чтобы при добавлении файлов и папок в хранилище свойства для них устанавливались бы автоматически. Есть два способа это сделать:" #. (para) #: ../source/TortoiseGit_en.xml:7764 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." -msgstr "Вы можете отредактировать файл настроек Subversion для включения этой функции в вашем клиенте. Во вкладке Общее в диалоге настроек TortoiseGit есть кнопка 'Правка', открывающая этот файл. Файл настроек является простым текстовым файлом, управляющим работой некоторых функций Subversion. Вам надо изменить две вещи: сначала в разделе miscellany разкомментируйте строчку enable-auto-props = yes. Затем вам необходимо будет отредактировать раздел ниже для указания того, какие свойства к каким типам файлов надо добавлять. Этот метод является стандартной возможностью Subversion и работает в любом клиенте Subversion. Однако, он должен быть определён на каждом клиенте индивидуально - нет способа распространять эти настройки из хранилища." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgstr "Вы можете отредактировать файл настроек Git для включения этой функции в вашем клиенте. Во вкладке Общее в диалоге настроек TortoiseGit есть кнопка 'Правка', открывающая этот файл. Файл настроек является простым текстовым файлом, управляющим работой некоторых функций Git. Вам надо изменить две вещи: сначала в разделе miscellany разкомментируйте строчку enable-auto-props = yes. Затем вам необходимо будет отредактировать раздел ниже для указания того, какие свойства к каким типам файлов надо добавлять. Этот метод является стандартной возможностью Git и работает в любом клиенте Git. Однако, он должен быть определён на каждом клиенте индивидуально - нет способа распространять эти настройки из хранилища." #. (para) #: ../source/TortoiseGit_en.xml:7781 @@ -6787,8 +6787,8 @@ msgstr "Фиксируйте свойства" #. (para) #: ../source/TortoiseGit_en.xml:7801 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." -msgstr "В Subversion свойства являются версированными. После изменения или добавления свойства, вы должны зафиксировать ваши изменения." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." +msgstr "В Git свойства являются версированными. После изменения или добавления свойства, вы должны зафиксировать ваши изменения." #. (title) #: ../source/TortoiseGit_en.xml:7807 @@ -6797,8 +6797,8 @@ msgstr "Конфликты в свойствах" #. (para) #: ../source/TortoiseGit_en.xml:7808 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." -msgstr "Если при фиксации изменений возникает конфликт из-за того, что другой пользователь изменил то же свойство, Subversion создаёт файл с расширением .prej. Удалите этот файл после улаживания конфликта." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." +msgstr "Если при фиксации изменений возникает конфликт из-за того, что другой пользователь изменил то же свойство, Git создаёт файл с расширением .prej. Удалите этот файл после улаживания конфликта." #. (title) #: ../source/TortoiseGit_en.xml:7817 @@ -6837,8 +6837,8 @@ msgstr "tsvn:logtemplate используется с прое #. (para) #: ../source/TortoiseGit_en.xml:7873 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." -msgstr "В Subversion есть возможность задавать автосвойства (autoprops), которые будут применяться к свежедобавленным или импортированным файлам, исходя из их расширений. Для корректной работы этой возможности необходима установка соответствующих автосвойств у каждого клиента в его файле настроек Subversion. Автосвойства tsvn:autoprops можно установить на папках, и тогда они будут объединяться с локальными автосвойствами пользователя при импорте или добавлении файлов. Формат такой же, как и для автосвойств Subversion, например, *.sh = svn:eol-style=native;svn:executable устанавливает два свойства на файлах с расширением .sh" +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgstr "В Git есть возможность задавать автосвойства (autoprops), которые будут применяться к свежедобавленным или импортированным файлам, исходя из их расширений. Для корректной работы этой возможности необходима установка соответствующих автосвойств у каждого клиента в его файле настроек Git. Автосвойства tsvn:autoprops можно установить на папках, и тогда они будут объединяться с локальными автосвойствами пользователя при импорте или добавлении файлов. Формат такой же, как и для автосвойств Git, например, *.sh = svn:eol-style=native;svn:executable устанавливает два свойства на файлах с расширением .sh" #. (para) #: ../source/TortoiseGit_en.xml:7886 @@ -6925,8 +6925,8 @@ msgstr "При добавлении новых подпапок посредст #. (para) #: ../source/TortoiseGit_en.xml:8006 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." -msgstr "Хотя свойства проекта, реализованные в TortoiseGit, исключительно полезны, они работают только c TortoiseGit, и некоторые из них будут работать только в свежих версиях TortoiseGit. Если люди, работающие над вашим проектом, пользуются также и другими клиентами Subversion, или, быть может, у них установлены старые версии TortoiseGit, то, возможно, лучше использовать ловушки на стороне хранилища для принудительного применения политик проекта. Свойства проекта могут только помочь выполнить политику, но они не могут принудительно применить её." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgstr "Хотя свойства проекта, реализованные в TortoiseGit, исключительно полезны, они работают только c TortoiseGit, и некоторые из них будут работать только в свежих версиях TortoiseGit. Если люди, работающие над вашим проектом, пользуются также и другими клиентами Git, или, быть может, у них установлены старые версии TortoiseGit, то, возможно, лучше использовать ловушки на стороне хранилища для принудительного применения политик проекта. Свойства проекта могут только помочь выполнить политику, но они не могут принудительно применить её." # ---- 5.17 #. (title) @@ -6958,8 +6958,8 @@ msgstr "Другой возможностью систем управления #. (para) #: ../source/TortoiseGit_en.xml:8049 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." -msgstr "В Subversion нет специальных команд для работы с ответвлениями или метками, вместо этого используются так называемые легкие копии (cheap copies). Легкие копии похожи на жесткие ссылки в Unix: это означает, что вместо того, чтобы сделать полную копию в хранилище, создаётся внутренняя ссылка, указывающая на определённое дерево/ревизию. В результате, ответвления и метки создаются очень быстро, и почти не занимают дополнительного места в хранилище." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgstr "В Git нет специальных команд для работы с ответвлениями или метками, вместо этого используются так называемые легкие копии (cheap copies). Легкие копии похожи на жесткие ссылки в Unix: это означает, что вместо того, чтобы сделать полную копию в хранилище, создаётся внутренняя ссылка, указывающая на определённое дерево/ревизию. В результате, ответвления и метки создаются очень быстро, и почти не занимают дополнительного места в хранилище." #. (title) #: ../source/TortoiseGit_en.xml:8059 @@ -7105,8 +7105,8 @@ msgstr "Если вы измените и зафиксируете создан #. (para) #: ../source/TortoiseGit_en.xml:8236 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " -msgstr "Несмотря на то, что сама Subversion не делает различий между метками и ответвлениями, типичные способы их использования немного отличаются. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgstr "Несмотря на то, что сама Git не делает различий между метками и ответвлениями, типичные способы их использования немного отличаются. " # ---- 5.18 #. (title) @@ -7132,8 +7132,8 @@ msgstr "Там, где ответвления используются для о #. (para) #: ../source/TortoiseGit_en.xml:8290 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." -msgstr "Важно понимать, как слияние и ветвление работают в Subversion перед началом их использования, так как этот процесс может стать довольно сложным. Настоятельно рекомендуется прочитать главу Branching and Merging (Ветвление и слияние) в Книге о Subversion, которая содержит полное описание и множество примеров использования." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." +msgstr "Важно понимать, как слияние и ветвление работают в Git перед началом их использования, так как этот процесс может стать довольно сложным. Настоятельно рекомендуется прочитать главу Branching and Merging (Ветвление и слияние) в Книге о Git, которая содержит полное описание и множество примеров использования." #. (para) #: ../source/TortoiseGit_en.xml:8300 @@ -7162,8 +7162,8 @@ msgstr "Этот метод применяется в случае, когда #. (para) #: ../source/TortoiseGit_en.xml:8333 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." -msgstr "Получается, что в этой ситуации вы предписываете Subversion выполнить следующее: Вычисли изменения, необходимые, чтобы [ОТ] ревизии 1 ответвления А перейти [ДО] ревизии 7 ответвления А, и примени эти изменения к моей рабочей копии (относящейся к стволу или ответвлению Б)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgstr "Получается, что в этой ситуации вы предписываете Git выполнить следующее: Вычисли изменения, необходимые, чтобы [ОТ] ревизии 1 ответвления А перейти [ДО] ревизии 7 ответвления А, и примени эти изменения к моей рабочей копии (относящейся к стволу или ответвлению Б)." #. (term) #. (title) @@ -7175,13 +7175,13 @@ msgstr "Воссоединение с ответвлением" # Поэтому, в этом частном случае, вы можете произвести слияние путём сравнения ответвления со стволом. #. (para) #: ../source/TortoiseGit_en.xml:8344 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." -msgstr "Этот метод применяется в случае, когда вы сделали ответвление для разработки новой функции, как описано в книге по Subversion. Все изменения неделя за неделей переносились из ствола в это ответвление, и теперь, когда разработка функции завершена, вы желаете произвести её слияние обратно со стволом. Поскольку вы регулярно синхронизировали ответвление со стволом, последние версии ответвления и ствола будут полностью идентичными, за исключением ваших изменений в ответвлении." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgstr "Этот метод применяется в случае, когда вы сделали ответвление для разработки новой функции, как описано в книге по Git. Все изменения неделя за неделей переносились из ствола в это ответвление, и теперь, когда разработка функции завершена, вы желаете произвести её слияние обратно со стволом. Поскольку вы регулярно синхронизировали ответвление со стволом, последние версии ответвления и ствола будут полностью идентичными, за исключением ваших изменений в ответвлении." #. (para) #: ../source/TortoiseGit_en.xml:8353 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." -msgstr "Это особый случай слияния деревьев, описанного ниже, и он требует только URL, откуда будет производиться слияние (обычно это ваше ответвление разработки). При этом используются возможности Subversion по отслеживанию слияний для вычисления корректных используемых диапазонов ревизий, и выполняются дополнительные проверки, чтобы убедиться, что ответвление было полностью обновлено и включает все изменения из ствола. Это сделано для того, чтобы вы случайно не убрали выполненную другими работу, зафиксированную ими в стволе после того, как вы последний раз синхронизировали изменения." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgstr "Это особый случай слияния деревьев, описанного ниже, и он требует только URL, откуда будет производиться слияние (обычно это ваше ответвление разработки). При этом используются возможности Git по отслеживанию слияний для вычисления корректных используемых диапазонов ревизий, и выполняются дополнительные проверки, чтобы убедиться, что ответвление было полностью обновлено и включает все изменения из ствола. Это сделано для того, чтобы вы случайно не убрали выполненную другими работу, зафиксированную ими в стволе после того, как вы последний раз синхронизировали изменения." #. (para) #: ../source/TortoiseGit_en.xml:8363 @@ -7200,13 +7200,13 @@ msgstr "Слияние двух различных деревьев" #. (para) #: ../source/TortoiseGit_en.xml:8383 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." -msgstr "Это более общий случай метода воссоединения. Вы предписываете Subversion выполнить следующее: Вычисли изменения, необходимые, чтобы [ОТ] ведущей ревизии ствола перейти [ДО] ведущей ревизии ответвления, и примени эти изменения к моей рабочей копии (относящейся к стволу). В конечном итоге ствол будет выглядеть точно так же, как и ответвление." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgstr "Это более общий случай метода воссоединения. Вы предписываете Git выполнить следующее: Вычисли изменения, необходимые, чтобы [ОТ] ведущей ревизии ствола перейти [ДО] ведущей ревизии ответвления, и примени эти изменения к моей рабочей копии (относящейся к стволу). В конечном итоге ствол будет выглядеть точно так же, как и ответвление." #. (para) #: ../source/TortoiseGit_en.xml:8391 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." -msgstr "Если ваш сервер/хранилище не поддерживают отслеживание слияний, то это единственный способ произвести слияние ответвления обратно в ствол. Другой типичный случай использования возникает при использовании ответвлений для кода сторонних производителей (vendor branches), когда вам необходимо произвести слияние изменений, возникающих после появления новой версии стороннего кода, с вашим кодом в стволе. Для дополнительной информации прочтите раздел об ответвлениях для кода сторонних производителей в Книге о Subversion." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." +msgstr "Если ваш сервер/хранилище не поддерживают отслеживание слияний, то это единственный способ произвести слияние ответвления обратно в ствол. Другой типичный случай использования возникает при использовании ответвлений для кода сторонних производителей (vendor branches), когда вам необходимо произвести слияние изменений, возникающих после появления новой версии стороннего кода, с вашим кодом в стволе. Для дополнительной информации прочтите раздел об ответвлениях для кода сторонних производителей в Книге о Git." #. (title) #: ../source/TortoiseGit_en.xml:8406 @@ -7251,8 +7251,8 @@ msgstr "В TortoiseGit вы указываете набор изменений #. (para) #: ../source/TortoiseGit_en.xml:8454 -msgid "If you are merging revisions in chunks, the method shown in the subversion book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." -msgstr "Если вы производите слияние ревизий большими кусками, показанный в Книге о Subversion метод предполагает, что вы сливаете ревизии 100-200 в первый заход и 200-300 в следующий. В TortoiseGit вы сливаете 100-200 сначала и 201-300 потом. " +msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." +msgstr "Если вы производите слияние ревизий большими кусками, показанный в Книге о Git метод предполагает, что вы сливаете ревизии 100-200 в первый заход и 200-300 в следующий. В TortoiseGit вы сливаете 100-200 сначала и 201-300 потом. " #. (para) #: ../source/TortoiseGit_en.xml:8461 @@ -7276,8 +7276,8 @@ msgstr "Если вы уже производили слияние некото #. (para) #: ../source/TortoiseGit_en.xml:8499 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." -msgstr "Если вы используете возможности Subversion по отслеживанию слияний, вам не нужно запоминать, какие ревизии уже были слиты - это для вас регистрирует Subversion. Если оставить диапазон ревизий пустым, то в слиянии будут участвовать все пока ещё не слитые ревизии. Прочтите для того, чтобы узнать об этом больше." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgstr "Если вы используете возможности Git по отслеживанию слияний, вам не нужно запоминать, какие ревизии уже были слиты - это для вас регистрирует Git. Если оставить диапазон ревизий пустым, то в слиянии будут участвовать все пока ещё не слитые ревизии. Прочтите для того, чтобы узнать об этом больше." #. (para) #: ../source/TortoiseGit_en.xml:8507 @@ -7373,8 +7373,8 @@ msgstr "Вы можете указать глубину охвата, приме #. (para) #: ../source/TortoiseGit_en.xml:8609 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" -msgstr "В большинстве случаев вам необходимо, чтобы слияние учитывало историю файла, с тем чтобы сливались только изменения относительно общего предка. Иногда вам необходимо произвести слияние файлов, которые возможно и связаны, но не в вашем хранилище. Например, вы импортировали версии 1 и 2 сторонней библиотеки в две различные папки. Несмотря на то, что они логически связаны, Subversion об этом не знает, потому что видит только импортированные вами архивы. Если вы попытаетесь произвести слияние различий между двумя этими деревьями, вы увидите полное удаление с последующим полным добавлением. Для того, чтобы в Subversion использовались различия, основанные только на пути, вместо различий, основанных на истории, отметьте флажок Игнорировать предков. Больше прочитать на эту тему можно в Книге о Subversion Noticing or Ignoring Ancestry (Учитывание или игнорирование предков)." +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" +msgstr "В большинстве случаев вам необходимо, чтобы слияние учитывало историю файла, с тем чтобы сливались только изменения относительно общего предка. Иногда вам необходимо произвести слияние файлов, которые возможно и связаны, но не в вашем хранилище. Например, вы импортировали версии 1 и 2 сторонней библиотеки в две различные папки. Несмотря на то, что они логически связаны, Git об этом не знает, потому что видит только импортированные вами архивы. Если вы попытаетесь произвести слияние различий между двумя этими деревьями, вы увидите полное удаление с последующим полным добавлением. Для того, чтобы в Git использовались различия, основанные только на пути, вместо различий, основанных на истории, отметьте флажок Игнорировать предков. Больше прочитать на эту тему можно в Книге о Git Noticing or Ignoring Ancestry (Учитывание или игнорирование предков)." #. (para) #: ../source/TortoiseGit_en.xml:8626 @@ -7408,13 +7408,13 @@ msgstr "Теперь слияние выполнено. Хорошей мысл #. (para) #: ../source/TortoiseGit_en.xml:8670 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." -msgstr "Для клиентов и серверов Subversion версий меньше 1.5, информация о слиянии не сохранялась и слитые ревизии надо было отслеживать вручную: когда вы проверили изменения и собираетесь фиксировать эту ревизию, в вашем сообщении при фиксации всегда должны быть указаны номера ревизий, которые вы перенесли в этом слиянии. Если вы позже пожелаете произвести ещё одно слияние, вам будет необходимо знать, что вы уже сливали, поскольку вам не нужно переносить изменения более одного раза. К сожалению, информацию о слияниях Subversion не ведёт. Дополнительная информация об этом содержится в Best Practices for Merging (Слияние. Лучший опыт) в Книге о Subversion." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." +msgstr "Для клиентов и серверов Git версий меньше 1.5, информация о слиянии не сохранялась и слитые ревизии надо было отслеживать вручную: когда вы проверили изменения и собираетесь фиксировать эту ревизию, в вашем сообщении при фиксации всегда должны быть указаны номера ревизий, которые вы перенесли в этом слиянии. Если вы позже пожелаете произвести ещё одно слияние, вам будет необходимо знать, что вы уже сливали, поскольку вам не нужно переносить изменения более одного раза. К сожалению, информацию о слияниях Git не ведёт. Дополнительная информация об этом содержится в Best Practices for Merging (Слияние. Лучший опыт) в Книге о Git." #. (para) #: ../source/TortoiseGit_en.xml:8687 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." -msgstr "Если ваш сервер и все клиенты Subversion версии 1.5 или больше, система отслеживания слияний будет регистрировать слитые ревизии и позволит избежать ситуации, когда ревизия сливается более одного раза. Это делает вашу жизнь намного проще, поскольку вы можете просто производить каждый раз слияние всего диапазона ревизий и знать, что только новые ревизии действительно будут слиты." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgstr "Если ваш сервер и все клиенты Git версии 1.5 или больше, система отслеживания слияний будет регистрировать слитые ревизии и позволит избежать ситуации, когда ревизия сливается более одного раза. Это делает вашу жизнь намного проще, поскольку вы можете просто производить каждый раз слияние всего диапазона ревизий и знать, что только новые ревизии действительно будут слиты." #. (para) #: ../source/TortoiseGit_en.xml:8694 @@ -7428,8 +7428,8 @@ msgstr "Если вы произвели слияние ответвления #. (para) #: ../source/TortoiseGit_en.xml:8709 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." -msgstr "Subversion не может производить слияние файла с папкой и наоборот - только папки с папками и файлы с файлами. Если вы откроете диалог слияния для файла, тогда вы должны указать в нём путь к файлу. Если вы вызовите диалог для папки, тогда вы должны указать для слияния URL папки." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgstr "Git не может производить слияние файла с папкой и наоборот - только папки с папками и файлы с файлами. Если вы откроете диалог слияния для файла, тогда вы должны указать в нём путь к файлу. Если вы вызовите диалог для папки, тогда вы должны указать для слияния URL папки." #. (title) #: ../source/TortoiseGit_en.xml:8719 @@ -7468,8 +7468,8 @@ msgstr "Можно пометить ревизии как в слия #. (para) #: ../source/TortoiseGit_en.xml:8723 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " -msgstr "В Subversion 1.5 появились средства для отслеживания слияний. При слиянии изменений из одного дерева в другое, номера ревизий регистрируются и эта информация может быть использована в нескольких разных целях. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgstr "В Git 1.5 появились средства для отслеживания слияний. При слиянии изменений из одного дерева в другое, номера ревизий регистрируются и эта информация может быть использована в нескольких разных целях. " #. (para) #: ../source/TortoiseGit_en.xml:8765 @@ -7478,8 +7478,8 @@ msgstr "Информация по отслеживанию слияний рег #. (para) #: ../source/TortoiseGit_en.xml:8775 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." -msgstr "Больше узнать об отслеживании слияний можно из документации об отслеживании слияний Subversion." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." +msgstr "Больше узнать об отслеживании слияний можно из документации об отслеживании слияний Git." #. (title) #: ../source/TortoiseGit_en.xml:8783 @@ -7594,18 +7594,18 @@ msgstr "Ваша компания в прошлом всегда использ #. (para) #: ../source/TortoiseGit_en.xml:8909 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " -msgstr "Как правило, Subversion работает лучше без блокировки, используя метод Копирование-Изменение-Слияние, описанный ранее в . Однако, есть несколько случаев, когда вам может потребоваться реализовать в некотором виде политику блокирования. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgstr "Как правило, Git работает лучше без блокировки, используя метод Копирование-Изменение-Слияние, описанный ранее в . Однако, есть несколько случаев, когда вам может потребоваться реализовать в некотором виде политику блокирования. " #. (para) #: ../source/TortoiseGit_en.xml:8933 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." -msgstr "Сначала вы должны убедиться, что ваш сервер Subversion обновлен до версии 1.2 как минимум. Более ранние версии вообще не поддерживали блокирования. Если вы используете доступ через file://, тогда, конечно, обновить потребуется только вашего клиента." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgstr "Сначала вы должны убедиться, что ваш сервер Git обновлен до версии 1.2 как минимум. Более ранние версии вообще не поддерживали блокирования. Если вы используете доступ через file://, тогда, конечно, обновить потребуется только вашего клиента." #. (title) #: ../source/TortoiseGit_en.xml:8940 -msgid "How Locking Works in Subversion" -msgstr "Как работает блокировка в Subversion" +msgid "How Locking Works in Git" +msgstr "Как работает блокировка в Git" #. (para) #: ../source/TortoiseGit_en.xml:8941 @@ -7619,8 +7619,8 @@ msgstr "Если вы заблок #. (para) #: ../source/TortoiseGit_en.xml:8954 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." -msgstr "Однако, другие пользователи могут и не знать, что вы получили блокировку. Если только они не проверяют регулярно состояние блокировок, то впервые они узнают об этом только когда их фиксация закончится неуспешно, что в большинстве случаев не очень практично. Для того, чтобы проще управлять блокировками, существует новое свойство Subversion svn:needs-lock. Если это свойство установлено (в любое значение) у файла, то всякий раз, когда файл извлекается или обновляется, локальная копия помечается как \"только-для-чтения\", за исключением случая, когда эта рабочая копия заблокировала этот файл. Это служит предупреждением о том, что вы не должны редактировать этот файл, пока не получите блокировку. Версированные файлы только-для-чтения отображаются со специальной пометкой в TortoiseGit для обозначения того, что вы должны получить блокировку перед началом редактирования." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgstr "Однако, другие пользователи могут и не знать, что вы получили блокировку. Если только они не проверяют регулярно состояние блокировок, то впервые они узнают об этом только когда их фиксация закончится неуспешно, что в большинстве случаев не очень практично. Для того, чтобы проще управлять блокировками, существует новое свойство Git svn:needs-lock. Если это свойство установлено (в любое значение) у файла, то всякий раз, когда файл извлекается или обновляется, локальная копия помечается как \"только-для-чтения\", за исключением случая, когда эта рабочая копия заблокировала этот файл. Это служит предупреждением о том, что вы не должны редактировать этот файл, пока не получите блокировку. Версированные файлы только-для-чтения отображаются со специальной пометкой в TortoiseGit для обозначения того, что вы должны получить блокировку перед началом редактирования." #. (para) #: ../source/TortoiseGit_en.xml:8970 @@ -7629,8 +7629,8 @@ msgstr "При регистрации блокировки используют #. (para) #: ../source/TortoiseGit_en.xml:8976 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." -msgstr "Что делать, если кто-либо из ваших коллег установил блокировку и уехал в отпуск, не сняв её? Subversion предоставляет средство для преодоления блокировки. Снятие блокировки, установленной кем-либо ещё, известно как прерывание блокировки, а принудительный захват блокировки, установленной кем-либо другим, называется перехват блокировки. Естественно, вы не должны делать это необдуманно, если вы желаете остаться друзьями со своими коллегами." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgstr "Что делать, если кто-либо из ваших коллег установил блокировку и уехал в отпуск, не сняв её? Git предоставляет средство для преодоления блокировки. Снятие блокировки, установленной кем-либо ещё, известно как прерывание блокировки, а принудительный захват блокировки, установленной кем-либо другим, называется перехват блокировки. Естественно, вы не должны делать это необдуманно, если вы желаете остаться друзьями со своими коллегами." #. (para) #: ../source/TortoiseGit_en.xml:8986 @@ -7699,8 +7699,8 @@ msgstr "Избегайте прерывания и перехвата блоки #. (para) #: ../source/TortoiseGit_en.xml:9077 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." -msgstr "Если вы прерываете или перехватываете чью-либо блокировку, не сообщая об этом, это потенциально может привести к потере выполненной работы. Если вы работаете с необъединяемыми типами файлов и перехватываете чью-либо блокировку, то, как только вы снимете блокировку, другие смогут зафиксировать свои изменения и перезаписать ваши. Subversion не теряет данные, но вы теряете предоставляемую блокировкой защиту при командной работе." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." +msgstr "Если вы прерываете или перехватываете чью-либо блокировку, не сообщая об этом, это потенциально может привести к потере выполненной работы. Если вы работаете с необъединяемыми типами файлов и перехватываете чью-либо блокировку, то, как только вы снимете блокировку, другие смогут зафиксировать свои изменения и перезаписать ваши. Git не теряет данные, но вы теряете предоставляемую блокировкой защиту при командной работе." #. (title) #: ../source/TortoiseGit_en.xml:9089 @@ -7714,8 +7714,8 @@ msgstr "Как уже говорилось, наиболее эффективн #. (para) #: ../source/TortoiseGit_en.xml:9100 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." -msgstr "Если у вас действует политика, при которой каждый файл должен быть заблокирован, то, возможно, будет легче применить возможность Subversion автоматически устанавливать свойства каждый раз, когда вы добавляете новые файлы (автосвойства). Для получения дополнительной информации прочтите ." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgstr "Если у вас действует политика, при которой каждый файл должен быть заблокирован, то, возможно, будет легче применить возможность Git автоматически устанавливать свойства каждый раз, когда вы добавляете новые файлы (автосвойства). Для получения дополнительной информации прочтите ." #. (title) #: ../source/TortoiseGit_en.xml:9109 @@ -7724,8 +7724,8 @@ msgstr "Скрипты ловушек на события блокировки" #. (para) #: ../source/TortoiseGit_en.xml:9110 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." -msgstr "Когда вы создаёте новое хранилище при помощи Subversion версии 1.2 или более старшей, в папке хранилища hooks создаются четыре шаблона ловушек. Они вызываются перед и после получением блокировки, а также перед и после снятия блокировки." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgstr "Когда вы создаёте новое хранилище при помощи Git версии 1.2 или более старшей, в папке хранилища hooks создаются четыре шаблона ловушек. Они вызываются перед и после получением блокировки, а также перед и после снятия блокировки." #. (para) #: ../source/TortoiseGit_en.xml:9116 @@ -8395,8 +8395,8 @@ msgstr "Вы можете также произвести слияние изм #. (para) #: ../source/TortoiseGit_en.xml:9958 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." -msgstr "Поскольку Subversion не может предоставить всей нужной информации, проводится некоторая необходимая интерпретация, которая иногда даёт странные результаты. Тем не менее, выдача для ствола будет давать, как правило, вполне пригодный результат." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgstr "Поскольку Git не может предоставить всей нужной информации, проводится некоторая необходимая интерпретация, которая иногда даёт странные результаты. Тем не менее, выдача для ствола будет давать, как правило, вполне пригодный результат." #. (para) #: ../source/TortoiseGit_en.xml:9968 @@ -8411,8 +8411,8 @@ msgstr "Если вы используете кэширование журнал # ---- 5.24 #. (title) #: ../source/TortoiseGit_en.xml:9987 -msgid "Exporting a Subversion Working Copy" -msgstr "Экспорт рабочей копии Subversion" +msgid "Exporting a Git Working Copy" +msgstr "Экспорт рабочей копии Git" #. (primary) #: ../source/TortoiseGit_en.xml:9989 @@ -8466,8 +8466,8 @@ msgstr "Экспортирование отдельных файлов" #. (para) #: ../source/TortoiseGit_en.xml:10062 -msgid "The export dialog does not allow exporting single files, even though Subversion can." -msgstr "Диалог экспорта не позволяет экспортировать отдельные файлы, немотря на то, что Subversion это может." +msgid "The export dialog does not allow exporting single files, even though Git can." +msgstr "Диалог экспорта не позволяет экспортировать отдельные файлы, немотря на то, что Git это может." #. (para) #: ../source/TortoiseGit_en.xml:10066 @@ -8559,8 +8559,8 @@ msgstr "Это очень редко используемая опер #. (para) #: ../source/TortoiseGit_en.xml:10156 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." -msgstr "Вы желаете перейти к другому хранилищу Subversion. В этом случае вы должны выполнить извлечение заново из нового местоположения хранилища." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." +msgstr "Вы желаете перейти к другому хранилищу Git. В этом случае вы должны выполнить извлечение заново из нового местоположения хранилища." #. (para) #: ../source/TortoiseGit_en.xml:10162 @@ -8605,8 +8605,8 @@ msgstr "система отслеживания ошибок" #. (para) #: ../source/TortoiseGit_en.xml:10196 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." -msgstr "При разработке программ очень часто бывает, что изменения следует связать с определенным ID ошибки или проблемы. Пользователи системы отслеживания ошибок (или системы отслеживания проблем) хотели бы связывать изменения, сделанные ими в Subversion, с конкретным ID в этой системе. Поэтому большинство систем отслеживания проблем предоставляют выполняемый перед фиксацией скрипт ловушки, который анализирует сообщение журнала для обнаружения ID ошибки, с которой связана эта фиксация. Этот способ до некоторой степени подвержен ошибкам, поскольку рассчитан на то, что пользователь напишет сообщение журнала должным образом, чтобы скрипт ловушки 'перед-фиксацией' смог разобрать его правильно." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgstr "При разработке программ очень часто бывает, что изменения следует связать с определенным ID ошибки или проблемы. Пользователи системы отслеживания ошибок (или системы отслеживания проблем) хотели бы связывать изменения, сделанные ими в Git, с конкретным ID в этой системе. Поэтому большинство систем отслеживания проблем предоставляют выполняемый перед фиксацией скрипт ловушки, который анализирует сообщение журнала для обнаружения ID ошибки, с которой связана эта фиксация. Этот способ до некоторой степени подвержен ошибкам, поскольку рассчитан на то, что пользователь напишет сообщение журнала должным образом, чтобы скрипт ловушки 'перед-фиксацией' смог разобрать его правильно." #. (para) #: ../source/TortoiseGit_en.xml:10209 @@ -8781,13 +8781,13 @@ msgstr "Только для свойств tsvn:Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." -msgstr "Эта интеграция с системой отслеживания проблем не ограничена только TortoiseGit; она может быть использована любым клиентом Subversion. Для получения дополнительной информации прочтите полную Спецификацию интеграции с системами отслеживания проблем (Issue Tracker Integration Specification) в хранилище исходного кода TortoiseGit ( рассказывает, как получить доступ к хранилищу исходного кода TortoiseGit)." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgstr "Эта интеграция с системой отслеживания проблем не ограничена только TortoiseGit; она может быть использована любым клиентом Git. Для получения дополнительной информации прочтите полную Спецификацию интеграции с системами отслеживания проблем (Issue Tracker Integration Specification) в хранилище исходного кода TortoiseGit ( рассказывает, как получить доступ к хранилищу исходного кода TortoiseGit)." #. (title) #: ../source/TortoiseGit_en.xml:10518 @@ -8842,8 +8842,8 @@ msgstr "WebSVN" #. (para) #: ../source/TortoiseGit_en.xml:10570 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." -msgstr "Есть несколько средств просмотра хранилища, работающих через веб-интерфейс, которые могут использоваться с Subversion, таких как ViewVC и WebSVN. TortoiseGit предоставляет возможность для связи с этими средствами просмотра." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgstr "Есть несколько средств просмотра хранилища, работающих через веб-интерфейс, которые могут использоваться с Git, таких как ViewVC и WebSVN. TortoiseGit предоставляет возможность для связи с этими средствами просмотра." #. (para) #: ../source/TortoiseGit_en.xml:10582 @@ -8898,8 +8898,8 @@ msgstr "Страница 'Общее' в диалоге настроек" #. (para) #: ../source/TortoiseGit_en.xml:10683 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." -msgstr " В этом диалоге можно указать предпочтитаемый вами язык интерфейса, а также некоторые специальные настройки Subversion." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." +msgstr " В этом диалоге можно указать предпочтитаемый вами язык интерфейса, а также некоторые специальные настройки Git." #. (term) #: ../source/TortoiseGit_en.xml:10693 @@ -8968,13 +8968,13 @@ msgstr "Общие шаблоны игнорирования использую #. (para) #: ../source/TortoiseGit_en.xml:10765 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." -msgstr "Обратите внимание: шаблоны игнорирования, задаваемые здесь, влияют также на других клиентов Subversion, работающих на вашем ПК, включая клиента командной строки." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." +msgstr "Обратите внимание: шаблоны игнорирования, задаваемые здесь, влияют также на других клиентов Git, работающих на вашем ПК, включая клиента командной строки." #. (para) #: ../source/TortoiseGit_en.xml:10771 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." -msgstr "Если вы воспользуетесь файлом настроек Subversion для установки шаблона global-ignores, то его значение перекроет сделанные здесь установки. Доступ к файлу настроек Subversion можно получить посредством кнопки Правка, описанной ниже." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." +msgstr "Если вы воспользуетесь файлом настроек Git для установки шаблона global-ignores, то его значение перекроет сделанные здесь установки. Доступ к файлу настроек Git можно получить посредством кнопки Правка, описанной ниже." #. (para) #: ../source/TortoiseGit_en.xml:10779 @@ -8993,13 +8993,13 @@ msgstr "Эта опция предписывает TortoiseGit устанавл #. (term) #: ../source/TortoiseGit_en.xml:10807 -msgid "Subversion configuration file" -msgstr "Файл настроек Subversion" +msgid "Git configuration file" +msgstr "Файл настроек Git" #. (para) #: ../source/TortoiseGit_en.xml:10809 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." -msgstr "Воспользуйтесь кнопкой Правка для непосредственного редактирования файла настроек. Некоторые настройки не могут быть изменены TortoiseGit напрямую, и вместо этого должны быть заданы здесь. Для более подробной информации о файле config Subversion смотрите Область настроек времени выполнения (Runtime Configuration Area). Раздел Автоматическая установка свойств (Automatic Property Setting) особенно интересен, и он настраивается именно здесь. Заметьте, что Subversion может считывать информацию о настройках из нескольких мест, и вам необходимо знать, которое из них имеет приоритет. Прочтите Конфигурация и реестр Windows (Configuration and the Windows Registry), чтобы узнать больше." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgstr "Воспользуйтесь кнопкой Правка для непосредственного редактирования файла настроек. Некоторые настройки не могут быть изменены TortoiseGit напрямую, и вместо этого должны быть заданы здесь. Для более подробной информации о файле config Git смотрите Область настроек времени выполнения (Runtime Configuration Area). Раздел Автоматическая установка свойств (Automatic Property Setting) особенно интересен, и он настраивается именно здесь. Заметьте, что Git может считывать информацию о настройках из нескольких мест, и вам необходимо знать, которое из них имеет приоритет. Прочтите Конфигурация и реестр Windows (Configuration and the Windows Registry), чтобы узнать больше." #. (term) #: ../source/TortoiseGit_en.xml:10834 @@ -9008,13 +9008,13 @@ msgstr "Использовать папки _svn вмест #. (para) #: ../source/TortoiseGit_en.xml:10836 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." -msgstr "VS.NET при использовании с веб-проектами не может обрабатывать папки .svn, которые Subversion использует для хранения своей внутренней информации. Это не ошибка в Subversion, это ошибка в VS.NET и в используемых им расширениях frontpage. Прочтите для дополнительной информации об этой проблеме." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgstr "VS.NET при использовании с веб-проектами не может обрабатывать папки .svn, которые Git использует для хранения своей внутренней информации. Это не ошибка в Git, это ошибка в VS.NET и в используемых им расширениях frontpage. Прочтите для дополнительной информации об этой проблеме." #. (para) #: ../source/TortoiseGit_en.xml:10843 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." -msgstr "Если вы желаете изменить поведение Subversion и TortoiseGit, вы можете использовать этот флажок для установки переменной окружения, которая этим управляет." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgstr "Если вы желаете изменить поведение Git и TortoiseGit, вы можете использовать этот флажок для установки переменной окружения, которая этим управляет." #. (para) #: ../source/TortoiseGit_en.xml:10848 @@ -9113,8 +9113,8 @@ msgstr "Автозакрытие при отсутствии конф #. (para) #: ../source/TortoiseGit_en.xml:10966 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." -msgstr "Автозакрытие при отсутствии ошибок всегда закрывает окно, даже если были конфликты. Окно остаётся открытым только в случае ошибок, которые не позволили Subversion выполнить задачу. Например, обновление не удалось из-за недоступности сервера, или фиксация не удалась из-за устаревания рабочей копии." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgstr "Автозакрытие при отсутствии ошибок всегда закрывает окно, даже если были конфликты. Окно остаётся открытым только в случае ошибок, которые не позволили Git выполнить задачу. Например, обновление не удалось из-за недоступности сервера, или фиксация не удалась из-за устаревания рабочей копии." #. (term) #: ../source/TortoiseGit_en.xml:10978 @@ -9483,13 +9483,13 @@ msgstr "Исключить пути используетс #. (para) #: ../source/TortoiseGit_en.xml:11380 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "f:\\development\\SVN\\Subversion отключит пометки только в этой конкретной папке. Вы по-прежнему будете видеть пометки на всех папках и файлах внутри этой папки." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "f:\\development\\SVN\\Git отключит пометки только в этой конкретной папке. Вы по-прежнему будете видеть пометки на всех папках и файлах внутри этой папки." #. (para) #: ../source/TortoiseGit_en.xml:11385 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "f:\\development\\SVN\\Subversion* отключит пометки на всех файлах и папках, чьи пути начинаются с f:\\development\\SVN\\Subversion. Это означает, что пометки не будут показываться для всех файлов и папок далее этого пути." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "f:\\development\\SVN\\Git* отключит пометки на всех файлах и папках, чьи пути начинаются с f:\\development\\SVN\\Git. Это означает, что пометки не будут показываться для всех файлов и папок далее этого пути." #. (para) #: ../source/TortoiseGit_en.xml:11392 @@ -9591,8 +9591,8 @@ msgstr " Здесь вы можете настроить ваш #. (para) #: ../source/TortoiseGit_en.xml:11487 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." -msgstr "Если вам необходимо задать настройки серверов-посредников отдельно для каждого хранилища, то для такой конфигурации вам надо будет воспользоваться файлом servers Subversion. Получить доступ к нему можно при помощи кнопки Поправить. Обратитесь к разделу Область настроек времени выполнения (Runtime Configuration Area) книги о Subversion для получения подробной информации об использовании этого файла." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgstr "Если вам необходимо задать настройки серверов-посредников отдельно для каждого хранилища, то для такой конфигурации вам надо будет воспользоваться файлом servers Git. Получить доступ к нему можно при помощи кнопки Поправить. Обратитесь к разделу Область настроек времени выполнения (Runtime Configuration Area) книги о Git для получения подробной информации об использовании этого файла." #. (para) #: ../source/TortoiseGit_en.xml:11497 @@ -9621,8 +9621,8 @@ msgstr "Чтобы избежать постоянного запроса пар #. (para) #: ../source/TortoiseGit_en.xml:11532 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." -msgstr "В заключение, настройка SSH на сервере и клиентах является нетривиальным процессом, выходящим за рамки этой документации. Однако, вы можете найти инструкции в ЧаВо (FAQ) TortoiseGit в разделе Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." +msgstr "В заключение, настройка SSH на сервере и клиентах является нетривиальным процессом, выходящим за рамки этой документации. Однако, вы можете найти инструкции в ЧаВо (FAQ) TortoiseGit в разделе Git/TortoiseGit SSH How-To." #. (title) #: ../source/TortoiseGit_en.xml:11542 @@ -9717,8 +9717,8 @@ msgstr "Если вы используете свойство svn:keywo #. (para) #: ../source/TortoiseGit_en.xml:11648 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." -msgstr "Вы также можете указать другой инструмент сравнения, применяемый для свойств Subversion. Поскольку свойства обычно являются простыми короткими текстовыми строками, вы можете использовать для просмотра более простой и компактный инструмент просмотра." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgstr "Вы также можете указать другой инструмент сравнения, применяемый для свойств Git. Поскольку свойства обычно являются простыми короткими текстовыми строками, вы можете использовать для просмотра более простой и компактный инструмент просмотра." #. (para) #: ../source/TortoiseGit_en.xml:11653 @@ -9894,8 +9894,8 @@ msgstr "Данные аутентификации" #. (para) #: ../source/TortoiseGit_en.xml:11881 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" -msgstr "При вашей аутентификации на сервере Subversion имя пользователя и пароль кэшируются локально, чтобы вам не приходилось вводить их снова и снова. Вы можете пожелать очистить этот кэш из соображений безопасности, или из-за того, что вы желаете подключится к хранилищу под другим пользователем... а коллега знает, что вы используете его персональный компьютер?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgstr "При вашей аутентификации на сервере Git имя пользователя и пароль кэшируются локально, чтобы вам не приходилось вводить их снова и снова. Вы можете пожелать очистить этот кэш из соображений безопасности, или из-за того, что вы желаете подключится к хранилищу под другим пользователем... а коллега знает, что вы используете его персональный компьютер?" #. (para) #: ../source/TortoiseGit_en.xml:11888 @@ -10134,8 +10134,8 @@ msgstr "Страница 'Скрипты ловушек' в диалоге на #. (para) #: ../source/TortoiseGit_en.xml:12122 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." -msgstr " В этом диалоге можно настроить скрипты ловушек, которые будут запускаться автоматически при совершении определённых действий Subversion. В отличие от скриптов ловушек, описанных в , эти скрипты выполняются локально на клиенте." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgstr " В этом диалоге можно настроить скрипты ловушек, которые будут запускаться автоматически при совершении определённых действий Git. В отличие от скриптов ловушек, описанных в , эти скрипты выполняются локально на клиенте." #. (para) #: ../source/TortoiseGit_en.xml:12132 @@ -10214,8 +10214,8 @@ msgstr "Перед-обновлением" #. (para) #: ../source/TortoiseGit_en.xml:12193 -msgid "Called before the actual Subversion update begins." -msgstr "Вызывается перед фактическим началом операции Subversion 'обновление'." +msgid "Called before the actual Git update begins." +msgstr "Вызывается перед фактическим началом операции Git 'обновление'." #. (term) #. (term) @@ -10326,8 +10326,8 @@ msgstr "Обратите внимание: хотя мы и указываем #. (para) #: ../source/TortoiseGit_en.xml:12371 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." -msgstr "Если вы желаете, чтобы операция Subversion откладывалась до окончания работы ловушки, отметьте Ждать окончания работы скрипта." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." +msgstr "Если вы желаете, чтобы операция Git откладывалась до окончания работы ловушки, отметьте Ждать окончания работы скрипта." # В целях отладки вы можете посмотреть, что происходит в этом окне DOS. #. (para) @@ -10437,8 +10437,8 @@ msgstr "Несколько редко используемых настроек #. (para) #: ../source/TortoiseGit_en.xml:12498 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." -msgstr "Вы можете указать другое месторасположение файла настроек Subversion при помощи ключа HKCU\\Software\\TortoiseGit\\ConfigDir. Это окажет воздействие на все операции TortoiseGit." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgstr "Вы можете указать другое месторасположение файла настроек Git при помощи ключа HKCU\\Software\\TortoiseGit\\ConfigDir. Это окажет воздействие на все операции TortoiseGit." #. (term) #: ../source/TortoiseGit_en.xml:12507 @@ -10502,8 +10502,8 @@ msgstr "В диалоге журнала подсвечивается текущ #. (title) #: ../source/TortoiseGit_en.xml:12588 -msgid "Subversion Working Folders" -msgstr "Рабочие папки Subversion" +msgid "Git Working Folders" +msgstr "Рабочие папки Git" #. (primary) #: ../source/TortoiseGit_en.xml:12590 @@ -10517,8 +10517,8 @@ msgstr "папка _svn" #. (para) #: ../source/TortoiseGit_en.xml:12595 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." -msgstr "VS.NET 2003 при использовании с веб-проектами не может обрабатывать папки .svn, используемые Subversion для хранения своей внутренней информации. Это не ошибка в Subversion, это ошибка в VS.NET 2003 и используемых им расширениях frontpage." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgstr "VS.NET 2003 при использовании с веб-проектами не может обрабатывать папки .svn, используемые Git для хранения своей внутренней информации. Это не ошибка в Git, это ошибка в VS.NET 2003 и используемых им расширениях frontpage." #. (para) #: ../source/TortoiseGit_en.xml:12602 @@ -10527,8 +10527,8 @@ msgstr "Обратите внимание: эта ошибка была испр #. (para) #: ../source/TortoiseGit_en.xml:12606 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." -msgstr "Начиная с версии 1.3.0 Subversion и TortoiseGit, вы можете установить переменную окружения SVN_ASP_DOT_NET_HACK. Если эта переменная установлена, тогда Subversion будет использовать папки _svn вместо папок .svn. Вы должны перезагрузить вашу оболочку для того, чтобы эта переменная возымела действие. Обычно это означает, что вы должны перезагрузить ПК. Для облегчения этой задачи, вы можете сделать это со страницы основных установок при помощи простого флажка - подробнее об этом рассказывает ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgstr "Начиная с версии 1.3.0 Git и TortoiseGit, вы можете установить переменную окружения SVN_ASP_DOT_NET_HACK. Если эта переменная установлена, тогда Git будет использовать папки _svn вместо папок .svn. Вы должны перезагрузить вашу оболочку для того, чтобы эта переменная возымела действие. Обычно это означает, что вы должны перезагрузить ПК. Для облегчения этой задачи, вы можете сделать это со страницы основных установок при помощи простого флажка - подробнее об этом рассказывает ." #. (para) #: ../source/TortoiseGit_en.xml:12616 @@ -10584,8 +10584,8 @@ msgstr "номер версии в файлах" #. (para) #: ../source/TortoiseGit_en.xml:12667 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." -msgstr "SubWCRev - это консольная программа Windows, которая может быть использована для чтения статуса рабочей копии Subversion и, при необходимости, для выполнения подстановки ключевых слов в шаблонных файлах. Это часто используется как часть процесса сборки, в качестве средства для внедрения информации из рабочей копии в собираемый объект. В основном это применяется для включения номера ревизии в диалог О программе." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgstr "SubWCRev - это консольная программа Windows, которая может быть использована для чтения статуса рабочей копии Git и, при необходимости, для выполнения подстановки ключевых слов в шаблонных файлах. Это часто используется как часть процесса сборки, в качестве средства для внедрения информации из рабочей копии в собираемый объект. В основном это применяется для включения номера ревизии в диалог О программе." # ---- 6.1 #. (title) @@ -10595,8 +10595,8 @@ msgstr "Командная строка SubWCRev" #. (para) #: ../source/TortoiseGit_en.xml:12682 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." -msgstr "По умолчанию, SubWCRev считывает статус Subversion для всех файлов в рабочей копии, за исключением внешних включений. Она запоминает наибольший найденный номер зафиксированной ревизии, дату и время фиксации, а также регистрирует, были ли локальные изменения в рабочей копии, или смешанные обновления ревизий. Номер ревизии, диапазон обновлений ревизий и статус изменений отображается в стандартный вывод (stdout)." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgstr "По умолчанию, SubWCRev считывает статус Git для всех файлов в рабочей копии, за исключением внешних включений. Она запоминает наибольший найденный номер зафиксированной ревизии, дату и время фиксации, а также регистрирует, были ли локальные изменения в рабочей копии, или смешанные обновления ревизий. Номер ревизии, диапазон обновлений ревизий и статус изменений отображается в стандартный вывод (stdout)." #. (para) #: ../source/TortoiseGit_en.xml:12690 @@ -11096,8 +11096,8 @@ msgstr "Сообщение, введённое при создании блок #. (para) #: ../source/TortoiseGit_en.xml:12996 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " -msgstr "Если вам необходимо получить доступ к информации Subversion о ревизиях из других программ, вы можете использовать COM-интерфейс SubWCRev. Объект, который необходимо создать - SubWCRev.object, и им поддерживаются следующие методы: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgstr "Если вам необходимо получить доступ к информации Git о ревизиях из других программ, вы можете использовать COM-интерфейс SubWCRev. Объект, который необходимо создать - SubWCRev.object, и им поддерживаются следующие методы: " #. (programlisting) #: ../source/TortoiseGit_en.xml:13114 @@ -11375,8 +11375,8 @@ msgstr "FAQ, ЧаВо" #. (para) #: ../source/TortoiseGit_en.xml:13202 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "Поскольку TortoiseGit разрабатывается постоянно, иногда тяжело содержать документацию в актуальном состоянии. Мы поддерживаем размещённый в Сети список ЧаВо (FAQ), в котором содержатся подборка из вопросов, наиболее часто задаваемых в списках рассылки TortoiseGit dev@TortoiseGit.tigris.org и users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "Поскольку TortoiseGit разрабатывается постоянно, иногда тяжело содержать документацию в актуальном состоянии. Мы поддерживаем размещённый в Сети список ЧаВо (FAQ), в котором содержатся подборка из вопросов, наиболее часто задаваемых в списках рассылки TortoiseGit tortoisegit-dev@googlegroups.com и tortoisegit-users@googlegroups.com ." #. (para) #: ../source/TortoiseGit_en.xml:13214 @@ -11385,8 +11385,8 @@ msgstr "Мы также поддерживаем users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." -msgstr "Если у вас есть вопрос, ответа на который вы больше нигде не нашли, лучшее место, где можно спросить - один из наших списков рассылки. users@TortoiseGit.tigris.org служит для вопросов по использованию TortoiseGit. Если у вас есть желание помочь с разработкой TortoiseGit, тогда вы должны принять участие в дискуссиях на dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." +msgstr "Если у вас есть вопрос, ответа на который вы больше нигде не нашли, лучшее место, где можно спросить - один из наших списков рассылки. tortoisegit-users@googlegroups.com служит для вопросов по использованию TortoiseGit. Если у вас есть желание помочь с разработкой TortoiseGit, тогда вы должны принять участие в дискуссиях на tortoisegit-dev@googlegroups.com ." # ---- App. B #. (title) @@ -11446,8 +11446,8 @@ msgstr "пустое сообщение" #. (para) #: ../source/TortoiseGit_en.xml:13305 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." -msgstr "Есть два способа предотвратить фиксации с пустыми сообщениями журнала. Один из них доступен только в TortoiseGit, другой работает для всех клиентов Subversion, но требует непосредственного доступа к серверу." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." +msgstr "Есть два способа предотвратить фиксации с пустыми сообщениями журнала. Один из них доступен только в TortoiseGit, другой работает для всех клиентов Git, но требует непосредственного доступа к серверу." #. (title) #: ../source/TortoiseGit_en.xml:13311 @@ -11466,7 +11466,7 @@ msgstr "На сервере в папке хранилища есть подпа #. (para) #: ../source/TortoiseGit_en.xml:13327 -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." msgstr "Этот метод рекомендуется, если ваши пользователи используют также клиенты, отличные от TortoiseGit. Недостаток этого метода заключается в том, что фиксация отклоняется сервером, и из-за этого пользователи получают сообщение об ошибке. Клиент перед выполнением фиксации не знает, что она будет отклонена. Если вы желаете, чтобы TortoiseGit отключал кнопку ОК до тех пор, пока сообщение журнала не достигнет достаточной длины, то воспользуйтесь методом, описанным ниже." #. (title) @@ -11613,8 +11613,8 @@ msgstr "Поскольку данные в TortoiseGit никогда не пр #. (para) #: ../source/TortoiseGit_en.xml:13528 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." -msgstr "Единственный путь удалить данные из хранилища - это использование инструмента командной строки Subversion svnadmin. Описание того, как с ним работать, содержит раздел Обслуживание хранилища (Repository Maintenance) книги о Subversion." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgstr "Единственный путь удалить данные из хранилища - это использование инструмента командной строки Git svnadmin. Описание того, как с ним работать, содержит раздел Обслуживание хранилища (Repository Maintenance) книги о Git." #. (title) #: ../source/TortoiseGit_en.xml:13539 @@ -11678,8 +11678,8 @@ msgstr "Установите свойство svn:externals #. (para) #: ../source/TortoiseGit_en.xml:13622 -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." -msgstr "Зафиксируйте новую папку. Теперь, при обновлении Subversion извлечёт копию этого проекта из хранилища и разместит в вашей рабочей копии. Подпапки при необходимости будут созданы автоматически. Каждый раз при обновлении основной рабочей копии вы также будете получать последнюю версию всех внешних проектов." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgstr "Зафиксируйте новую папку. Теперь, при обновлении Git извлечёт копию этого проекта из хранилища и разместит в вашей рабочей копии. Подпапки при необходимости будут созданы автоматически. Каждый раз при обновлении основной рабочей копии вы также будете получать последнюю версию всех внешних проектов." #. (para) #: ../source/TortoiseGit_en.xml:13641 @@ -11693,8 +11693,8 @@ msgstr "Используя вложенную рабочую копию" #. (para) #: ../source/TortoiseGit_en.xml:13650 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" -msgstr "Создайте новую папку в вашем проекте, которая будет содержать общий код, но не добавляйте её в Subversion." +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" +msgstr "Создайте новую папку в вашем проекте, которая будет содержать общий код, но не добавляйте её в Git." #. (para) #: ../source/TortoiseGit_en.xml:13654 @@ -12284,8 +12284,8 @@ msgstr "Поскольку всеми командами TortoiseGit можно #. (para) #: ../source/TortoiseGit_en.xml:14157 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." -msgstr "Помните, что TortoiseGit является клиентом с графическим интерфейсом пользователя, и это руководство по автоматизации показывает, как показывать диалоги TortoiseGit для получения пользовательского ввода. Если вы хотите написать скрипт, который не требует ввода, вы должны использовать официальный клиент Subversion для командной строки." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." +msgstr "Помните, что TortoiseGit является клиентом с графическим интерфейсом пользователя, и это руководство по автоматизации показывает, как показывать диалоги TortoiseGit для получения пользовательского ввода. Если вы хотите написать скрипт, который не требует ввода, вы должны использовать официальный клиент Git для командной строки." #. (title) #. (title) @@ -12907,18 +12907,18 @@ msgstr "CLI" #. (para) #: ../source/TortoiseGit_en.xml:14751 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." -msgstr "Иногда это руководство отсылает вас к основной документации Subversion, которая описывает Subversion в терминах интерфейса командной строки - ИКС (Command Line Interface - CLI). Чтобы помочь вам понять, что TortoiseGit делает за кулисами, мы составили список, показывающий эквиваленты команд ИКС для каждой операции, выполняемой в графическом интерфейсе TortoiseGit." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgstr "Иногда это руководство отсылает вас к основной документации Git, которая описывает Git в терминах интерфейса командной строки - ИКС (Command Line Interface - CLI). Чтобы помочь вам понять, что TortoiseGit делает за кулисами, мы составили список, показывающий эквиваленты команд ИКС для каждой операции, выполняемой в графическом интерфейсе TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:14760 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." -msgstr "Даже несмотря на то, что в ИКС есть эквиваленты для операций, выполняемых TortoiseGit, помните, что TortoiseGit не вызывает ИКС, а использует библиотеку Subversion напрямую." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." +msgstr "Даже несмотря на то, что в ИКС есть эквиваленты для операций, выполняемых TortoiseGit, помните, что TortoiseGit не вызывает ИКС, а использует библиотеку Git напрямую." #. (para) #: ../source/TortoiseGit_en.xml:14766 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." -msgstr "Если вы думаете, что нашли ошибку в TortoiseGit, мы можем попросить вас попробовать воспроизвести её при помощи ИКС, чтобы мы могли отделить проблемы с TortoiseGit от проблем с Subversion. Этот справочник расскажет вам, какую команду надо попробовать." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." +msgstr "Если вы думаете, что нашли ошибку в TortoiseGit, мы можем попросить вас попробовать воспроизвести её при помощи ИКС, чтобы мы могли отделить проблемы с TortoiseGit от проблем с Git. Этот справочник расскажет вам, какую команду надо попробовать." #. (title) #: ../source/TortoiseGit_en.xml:14774 @@ -12981,8 +12981,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14824 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." -msgstr "Обновление нескольких элементов в данный момент не является атомарной операцией в Subversion. Поэтому TortoiseGit сначала находит ведущую ревизию (HEAD) в хранилище, а затем обновляет все элементы до этой ревизии во избежание создания рабочей копии со смешанными ревизиями." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgstr "Обновление нескольких элементов в данный момент не является атомарной операцией в Git. Поэтому TortoiseGit сначала находит ведущую ревизию (HEAD) в хранилище, а затем обновляет все элементы до этой ревизии во избежание создания рабочей копии со смешанными ревизиями." #. (para) #: ../source/TortoiseGit_en.xml:14831 @@ -13018,8 +13018,8 @@ msgstr "Если помечен флажок Обновить толь #. (para) #: ../source/TortoiseGit_en.xml:14859 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." -msgstr "В TortoiseGit диалог фиксации использует несколько команд Subversion. Первая стадия - это проверка статуса, которая определяет элементы вашей рабочей копии, которые потенциально могут быть зафиксированы. Вы можете просмотреть этот список, сравнить файлы с их базой и выбрать элементы, которые вы желаете включить в фиксацию." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgstr "В TortoiseGit диалог фиксации использует несколько команд Git. Первая стадия - это проверка статуса, которая определяет элементы вашей рабочей копии, которые потенциально могут быть зафиксированы. Вы можете просмотреть этот список, сравнить файлы с их базой и выбрать элементы, которые вы желаете включить в фиксацию." #. (screen) #. (screen) @@ -13039,8 +13039,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14869 #: ../source/TortoiseGit_en.xml:14957 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." -msgstr "Если отмечен флажок Показать неверсированные файлы, TortoiseGit также будет показывать неверсированные файлы и папки в иерархии рабочей копии, учитывая правила игнорирования. Конкретно это свойство не имеет прямого эквивалента в Subversion, поскольку команда svn status не заходит в неверсированные папки." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." +msgstr "Если отмечен флажок Показать неверсированные файлы, TortoiseGit также будет показывать неверсированные файлы и папки в иерархии рабочей копии, учитывая правила игнорирования. Конкретно это свойство не имеет прямого эквивалента в Git, поскольку команда svn status не заходит в неверсированные папки." #. (para) #: ../source/TortoiseGit_en.xml:14877 @@ -13061,8 +13061,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14884 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." -msgstr "Когда вы нажимаете на ОК, Subversion начинает выполнение фиксации. Если вы оставили все флажки, отмечающие файлы, в состоянии по умолчанию, TortoiseGit использует одну рекурсивную фиксацию рабочей копии. Если вы сняли пометки с некоторых файлов, тогда должна использоваться нерекурсивная фиксация (-N), и каждый путь должен быть указан индивидуально в командной строке для фиксации." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgstr "Когда вы нажимаете на ОК, Git начинает выполнение фиксации. Если вы оставили все флажки, отмечающие файлы, в состоянии по умолчанию, TortoiseGit использует одну рекурсивную фиксацию рабочей копии. Если вы сняли пометки с некоторых файлов, тогда должна использоваться нерекурсивная фиксация (-N), и каждый путь должен быть указан индивидуально в командной строке для фиксации." #. (screen) #: ../source/TortoiseGit_en.xml:14892 @@ -13248,8 +13248,8 @@ msgstr "Первая стадия - проверка статуса, опред #. (para) #: ../source/TortoiseGit_en.xml:15037 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." -msgstr "Когда вы нажмёте на ОК, Subversion уберёт изменения. Если вы оставили все флажки выбора файлов в состоянии по умолчанию, TortoiseGit использует одиночную рекурсивную (-R) отмену изменений в рабочей копии. Если вы снимете пометки с некоторых файлов, тогда каждый путь должен быть указан индивидуально в командной строке для удаления изменений." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgstr "Когда вы нажмёте на ОК, Git уберёт изменения. Если вы оставили все флажки выбора файлов в состоянии по умолчанию, TortoiseGit использует одиночную рекурсивную (-R) отмену изменений в рабочей копии. Если вы снимете пометки с некоторых файлов, тогда каждый путь должен быть указан индивидуально в командной строке для удаления изменений." #. (screen) #: ../source/TortoiseGit_en.xml:15044 @@ -13403,8 +13403,8 @@ msgstr "Эта форма используется, когда вызывает #. (para) #: ../source/TortoiseGit_en.xml:15139 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." -msgstr "Экспорт рабочей копии в другое место делается без использования библиотеки Subversion, так что подходящего эквивалента командной строки нет." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." +msgstr "Экспорт рабочей копии в другое место делается без использования библиотеки Git, так что подходящего эквивалента командной строки нет." #. (para) #: ../source/TortoiseGit_en.xml:15144 @@ -13514,8 +13514,8 @@ msgstr "TortoiseGit создаёт файл заплатки в формате #. (para) #: ../source/TortoiseGit_en.xml:15225 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." -msgstr "Применение заплатки - хитрое дело, если только у заплатки и рабочей копии не одна и та же ревизия. К счастью для вас, можно использовать программу TortoiseMerge, которая не имеет прямого эквивалента в Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." +msgstr "Применение заплатки - хитрое дело, если только у заплатки и рабочей копии не одна и та же ревизия. К счастью для вас, можно использовать программу TortoiseMerge, которая не имеет прямого эквивалента в Git." # ---- App. F #. (title) @@ -13535,8 +13535,8 @@ msgstr "приоритеты пометок" #. (para) #: ../source/TortoiseGit_en.xml:15254 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." -msgstr "Каждому файлу и папке соответствует значение статуса Subversion, сообщаемое библиотекой Subversion. В клиенте командной строки статус обозначается однобуквенным кодом, но в TortoiseGit они показываются графически, в виде пометок на значках. Поскольку количество пометок сильно ограничено, каждая пометка может представлять один из нескольких значений статуса." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgstr "Каждому файлу и папке соответствует значение статуса Git, сообщаемое библиотекой Git. В клиенте командной строки статус обозначается однобуквенным кодом, но в TortoiseGit они показываются графически, в виде пометок на значках. Поскольку количество пометок сильно ограничено, каждая пометка может представлять один из нескольких значений статуса." # Если в процессе обновления возник конфликт, тогда пометка меняется на желтый восклицательный знак. #. (para) @@ -13562,13 +13562,13 @@ msgstr " Пометка #. (para) #: ../source/TortoiseGit_en.xml:15296 -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." -msgstr " Пометка В Subversion применяется для обозначения элемента в нормальном состоянии, а также используется для версированного элемента, чьё состояние пока неизвестно. Поскольку TortoiseGit использует фоновый кэширующий процесс для получения статуса, может потребоваться несколько секунд для обновления пометки." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgstr " Пометка В Git применяется для обозначения элемента в нормальном состоянии, а также используется для версированного элемента, чьё состояние пока неизвестно. Поскольку TortoiseGit использует фоновый кэширующий процесс для получения статуса, может потребоваться несколько секунд для обновления пометки." #. (para) #: ../source/TortoiseGit_en.xml:15305 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." -msgstr " Пометка Требуется блокировка применяется для обозначения того, что у файла установлено свойство svn:needs-lock. Для рабочих копий, созданных при помощи Subversion 1.4.0 или более поздних версий, состояние svn:needs-lock кэшируется локально Subversion, что и используется для определения того, когда показывать пометку. Для рабочих копий в формате версий до 1.4.0, TortoiseGit показывает эту пометку, когда файл имеет статус только-для-чтения. Обратите внимание, Subversion автоматически обновляет рабочие копии при выполнении операции обновления, хотя кэширование свойства svn:needs-lock может не произойти, пока не будет обновлён сам файл." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgstr " Пометка Требуется блокировка применяется для обозначения того, что у файла установлено свойство svn:needs-lock. Для рабочих копий, созданных при помощи Git 1.4.0 или более поздних версий, состояние svn:needs-lock кэшируется локально Git, что и используется для определения того, когда показывать пометку. Для рабочих копий в формате версий до 1.4.0, TortoiseGit показывает эту пометку, когда файл имеет статус только-для-чтения. Обратите внимание, Git автоматически обновляет рабочие копии при выполнении операции обновления, хотя кэширование свойства svn:needs-lock может не произойти, пока не будет обновлён сам файл." #. (para) #: ../source/TortoiseGit_en.xml:15319 @@ -13587,13 +13587,13 @@ msgstr " Пометка #. (para) #: ../source/TortoiseGit_en.xml:15340 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." -msgstr "Если элемент имеет статус Subversion none (элемент вне рабочей копии), то пометка не показывается. Если вы отключили пометки Игнорируемое и Неверсированное, то и для этих файлов никаких пометок показано не будет." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgstr "Если элемент имеет статус Git none (элемент вне рабочей копии), то пометка не показывается. Если вы отключили пометки Игнорируемое и Неверсированное, то и для этих файлов никаких пометок показано не будет." #. (para) #: ../source/TortoiseGit_en.xml:15347 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." -msgstr "У элемента может быть только одно значение статуса Subversion. Например, файл может быть изменён локально и в то же время помечен для удаления. Subversion вернёт единственное значение статуса - в данном случае удалён. Эти приоритеты определены внутри самой Subversion." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." +msgstr "У элемента может быть только одно значение статуса Git. Например, файл может быть изменён локально и в то же время помечен для удаления. Git вернёт единственное значение статуса - в данном случае удалён. Эти приоритеты определены внутри самой Git." #. (para) #: ../source/TortoiseGit_en.xml:15354 @@ -13638,23 +13638,23 @@ msgstr "Организация защиты Svnserve при помощи SSH" #. (para) #: ../source/TortoiseGit_en.xml:15417 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." -msgstr "В этом разделе приведено руководство, рассказывающее о том, как шаг за шагом настроить Subversion и TortoiseGit для использования протокола svn+ssh. Если вы уже используете соединения, аутентифицируемые SSH, для входа на ваш сервер, то вам это руководство не пригодится и вы можете найти дополнительные подробности в книге о Subversion. Если вы пока не начали использовать SSH, но хотели бы это сделать для защиты вашей установки Subversion, это руководство предоставит простой метод, который не требует создания на сервере для каждого пользователя Subversion отдельной пользовательской учётной записи для доступа через SSH." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." +msgstr "В этом разделе приведено руководство, рассказывающее о том, как шаг за шагом настроить Git и TortoiseGit для использования протокола svn+ssh. Если вы уже используете соединения, аутентифицируемые SSH, для входа на ваш сервер, то вам это руководство не пригодится и вы можете найти дополнительные подробности в книге о Git. Если вы пока не начали использовать SSH, но хотели бы это сделать для защиты вашей установки Git, это руководство предоставит простой метод, который не требует создания на сервере для каждого пользователя Git отдельной пользовательской учётной записи для доступа через SSH." #. (para) #: ../source/TortoiseGit_en.xml:15427 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." -msgstr "В этой реализации мы создаём одну учётную запись пользователя для доступа через SSH для всех пользователей Subversion, и используем различные ключи аутентификации для разграничения между реальными пользователями Subversion." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." +msgstr "В этой реализации мы создаём одну учётную запись пользователя для доступа через SSH для всех пользователей Git, и используем различные ключи аутентификации для разграничения между реальными пользователями Git." #. (para) #: ../source/TortoiseGit_en.xml:15432 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." -msgstr "В этом приложении мы предполагаем, что у вас уже установлены инструменты Subversion, и что вы уже создали хранилище, как описано в другом месте руководства. Обратите внимание: вы не должны запускать svnserve как службу или демон при использовании с SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgstr "В этом приложении мы предполагаем, что у вас уже установлены инструменты Git, и что вы уже создали хранилище, как описано в другом месте руководства. Обратите внимание: вы не должны запускать svnserve как службу или демон при использовании с SSH." #. (para) #: ../source/TortoiseGit_en.xml:15438 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" -msgstr "Большая часть приведённой здесь информации поступила из обучающего документа, подготовленного Марком Логеманном (Marc Logemann), который может быть найден по адресу www.logemann.org Дополнительная информация по настройке севера Windows была предоставлена Торстеном Мюллером (Thorsten Müller). Спасибо, ребята!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgstr "Большая часть приведённой здесь информации поступила из обучающего документа, подготовленного Марком Логеманном (Marc Logemann), который может быть найден по адресу www.logemann.org Дополнительная информация по настройке севера Windows была предоставлена Торстеном Мюллером (Thorsten Müller). Спасибо, ребята!" #. (title) #: ../source/TortoiseGit_en.xml:15449 @@ -13674,8 +13674,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15459 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." -msgstr "Ещё один момент: если вы собирали Subversion из исходного кода и не указывали аргументов для ./configure, Subversion создаёт папку bin в /usr/local и помещает свои исполняемые файлы туда. Если вы собираетесь использовать режим туннелирования с SSH, вы должны понимать, что пользователь, зашедший через SSH, должен запустить программу svnserve и некоторые другие исполняемые файлы. По этой причине, либо поместите /usr/local/bin в переменную PATH, либо создайте символьные ссылки ваших исполняемых файлов в папке /usr/sbin, или в любой другой папке, которая обычно есть в PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgstr "Ещё один момент: если вы собирали Git из исходного кода и не указывали аргументов для ./configure, Git создаёт папку bin в /usr/local и помещает свои исполняемые файлы туда. Если вы собираетесь использовать режим туннелирования с SSH, вы должны понимать, что пользователь, зашедший через SSH, должен запустить программу svnserve и некоторые другие исполняемые файлы. По этой причине, либо поместите /usr/local/bin в переменную PATH, либо создайте символьные ссылки ваших исполняемых файлов в папке /usr/sbin, или в любой другой папке, которая обычно есть в PATH." #. (para) #: ../source/TortoiseGit_en.xml:15472 @@ -13836,8 +13836,8 @@ msgstr "Проверка SSH при помощи TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:15622 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." -msgstr "Пока мы проверили только то, что вы можете зайти на сервер при помощи SSH. Теперь нам надо убедиться, что SSH-соединение действительно может выполнять svnserve. На сервере измените /home/svnuser/.ssh/authorized_keys как указано далее, чтобы разрешить нескольким авторам Subversion использовать одну и ту же системную учётную запись, svnuser. Обратите внимание: каждый автор Subversion использует одну и ту же учётную запись, но различные ключи аутентификации, таким образом, вы должны добавить по одной строке для каждого автора." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." +msgstr "Пока мы проверили только то, что вы можете зайти на сервер при помощи SSH. Теперь нам надо убедиться, что SSH-соединение действительно может выполнять svnserve. На сервере измените /home/svnuser/.ssh/authorized_keys как указано далее, чтобы разрешить нескольким авторам Git использовать одну и ту же системную учётную запись, svnuser. Обратите внимание: каждый автор Git использует одну и ту же учётную запись, но различные ключи аутентификации, таким образом, вы должны добавить по одной строке для каждого автора." #. (para) #: ../source/TortoiseGit_en.xml:15631 @@ -13958,8 +13958,8 @@ msgstr "Глоссарий" #. (para) #: ../source/TortoiseGit_en.xml:15774 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Команда Subversion, которая используется для добавления файла или папки в вашу рабочую копию. Эти новые элементы будут добавлены в хранилище при фиксации." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Команда Git, которая используется для добавления файла или папки в вашу рабочую копию. Эти новые элементы будут добавлены в хранилище при фиксации." #. (glossterm) #: ../source/TortoiseGit_en.xml:15782 @@ -13993,23 +13993,23 @@ msgstr "Ответвление" #. (para) #: ../source/TortoiseGit_en.xml:15816 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Термин, часто используемый в системах управления версиями для описания ситуации, когда разработка разветвляется в определённой точке и следует по двум различным путям. Можно создать ответвление из основной линии разработки - для реализации новой возможности без приведения главной линии в нестабильное состояние, или можно ответвить стабильную версию, в которой делаются только исправления ошибок, в то время как новые разработки ведутся в нестабильном стволе. В Subversion ответвления реализованы как лёгкие копии." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Термин, часто используемый в системах управления версиями для описания ситуации, когда разработка разветвляется в определённой точке и следует по двум различным путям. Можно создать ответвление из основной линии разработки - для реализации новой возможности без приведения главной линии в нестабильное состояние, или можно ответвить стабильную версию, в которой делаются только исправления ошибок, в то время как новые разработки ведутся в нестабильном стволе. В Git ответвления реализованы как лёгкие копии." #. (para) #: ../source/TortoiseGit_en.xml:15831 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "Команда Subversion, создающая локальную рабочую копию в пустой папке путём загрузки версированных файлов из хранилища." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "Команда Git, создающая локальную рабочую копию в пустой папке путём загрузки версированных файлов из хранилища." #. (para) #: ../source/TortoiseGit_en.xml:15840 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Цитата из Книги о Subversion: Рекурсивно очищает рабочую копию, удаляя блокировки и возобновляя незаконченные действия. Если вы когда-либо столкнётесь с ошибкой рабочая копия заблокирована, то запустите эту команду для удаления подвисших блокировок и приведения вашей рабочей копии в работоспособное состояние. Заметьте, что в этом контексте блокировка относится к блокированию в локальной файловой системе, а не в хранилище." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Цитата из Книги о Git: Рекурсивно очищает рабочую копию, удаляя блокировки и возобновляя незаконченные действия. Если вы когда-либо столкнётесь с ошибкой рабочая копия заблокирована, то запустите эту команду для удаления подвисших блокировок и приведения вашей рабочей копии в работоспособное состояние. Заметьте, что в этом контексте блокировка относится к блокированию в локальной файловой системе, а не в хранилище." #. (para) #: ../source/TortoiseGit_en.xml:15857 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Эта команда Subversion используется для передачи изменений из вашей рабочей копии обратно в хранилище, при этом создавая в нём новую ревизию." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Эта команда Git используется для передачи изменений из вашей рабочей копии обратно в хранилище, при этом создавая в нём новую ревизию." #. (glossterm) #: ../source/TortoiseGit_en.xml:15865 @@ -14018,8 +14018,8 @@ msgstr "Конфликт" #. (para) #: ../source/TortoiseGit_en.xml:15867 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Когда изменения из хранилища сливаются с локальными, иногда случается, что они затрагивают одни и те же строки. В этом случае Subversion не может самостоятельно решить, какую из версий использовать и файл считается находящимся в конфликтном состоянии. Вы должны вручную отредактировать файл и уладить конфликты перед тем, как вы сможете зафиксировать любые дальнейшие изменения." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Когда изменения из хранилища сливаются с локальными, иногда случается, что они затрагивают одни и те же строки. В этом случае Git не может самостоятельно решить, какую из версий использовать и файл считается находящимся в конфликтном состоянии. Вы должны вручную отредактировать файл и уладить конфликты перед тем, как вы сможете зафиксировать любые дальнейшие изменения." #. (glossterm) #: ../source/TortoiseGit_en.xml:15877 @@ -14028,8 +14028,8 @@ msgstr "Копирование" #. (para) #: ../source/TortoiseGit_en.xml:15879 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "В хранилище Subversion вы можете создать копию одного файла или целого дерева. Это реализовано через лёгкие копии, которые ведут себя подобно ссылке на оригинал: они почти не занимают места. Создание копии сохраняет историю элемента в копии, так что вы можете отследить изменения, сделанные до создания копии." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "В хранилище Git вы можете создать копию одного файла или целого дерева. Это реализовано через лёгкие копии, которые ведут себя подобно ссылке на оригинал: они почти не занимают места. Создание копии сохраняет историю элемента в копии, так что вы можете отследить изменения, сделанные до создания копии." #. (para) #: ../source/TortoiseGit_en.xml:15891 @@ -14053,8 +14053,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15922 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Собственная внутренняя файловая система Subversion для хранилищ. Может быть использована на сетевых разделяемых ресурсах. Используется по умолчанию для хранилищ, начиная с версии 1.2." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Собственная внутренняя файловая система Git для хранилищ. Может быть использована на сетевых разделяемых ресурсах. Используется по умолчанию для хранилищ, начиная с версии 1.2." #. (para) #: ../source/TortoiseGit_en.xml:15931 @@ -14073,8 +14073,8 @@ msgstr "Последняя ревизия файла или папки в Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "Если рабочая копия содержит изменения только в текстовых файлах, можно воспользоваться командой 'Различия' Subversion для генерации одного сводного файла, содержащего все эти изменения в формате объединённых различий. Файлы этого типа часто называются Заплатками, и они могут быть отправлены по электропочте кому-либо ещё (или в список рассылки) и применены к другой рабочей копии. Кто-нибудь без возможности фиксировать изменения может подготовить изменения и отправить файл заплатки для применения лицу, обладающему правом фиксации. Или, если нет уверенности в изменении, можно отправить заплатку другим для рецензирования." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "Если рабочая копия содержит изменения только в текстовых файлах, можно воспользоваться командой 'Различия' Git для генерации одного сводного файла, содержащего все эти изменения в формате объединённых различий. Файлы этого типа часто называются Заплатками, и они могут быть отправлены по электропочте кому-либо ещё (или в список рассылки) и применены к другой рабочей копии. Кто-нибудь без возможности фиксировать изменения может подготовить изменения и отправить файл заплатки для применения лицу, обладающему правом фиксации. Или, если нет уверенности в изменении, можно отправить заплатку другим для рецензирования." #. (glossterm) #: ../source/TortoiseGit_en.xml:16013 @@ -14128,8 +14128,8 @@ msgstr "Свойство" #. (para) #: ../source/TortoiseGit_en.xml:16015 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Помимо версирования ваших папок и файлов, Subversion позволяет добавлять версированные метаданные, - называемые свойствами, - к каждому версированному файлу или папке. У каждого свойства есть имя и значение, почти как у ключа реестра. В Subversion есть несколько специальных свойств для внутреннего использования, таких как svn:eol-style. И у TortoiseGit тоже есть такого рода свойства, вроде tsvn:logminsize. Вы можете добавить ваши собственные свойства с именем и значением по вашему выбору." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Помимо версирования ваших папок и файлов, Git позволяет добавлять версированные метаданные, - называемые свойствами, - к каждому версированному файлу или папке. У каждого свойства есть имя и значение, почти как у ключа реестра. В Git есть несколько специальных свойств для внутреннего использования, таких как svn:eol-style. И у TortoiseGit тоже есть такого рода свойства, вроде tsvn:logminsize. Вы можете добавить ваши собственные свойства с именем и значением по вашему выбору." #. (para) #: ../source/TortoiseGit_en.xml:16030 @@ -14158,8 +14158,8 @@ msgstr "В случае, когда файлы в рабочей копии на #. (para) #: ../source/TortoiseGit_en.xml:16070 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion локально сохраняет нетронутую копию каждого файла, каким этот файл был при последнем обновлении рабочей копии. Если вы сделали какие-то изменения и решили их откатить, вы можете использовать команду Убрать изменения для того, чтобы вернуться к нетронутой копии." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git локально сохраняет нетронутую копию каждого файла, каким этот файл был при последнем обновлении рабочей копии. Если вы сделали какие-то изменения и решили их откатить, вы можете использовать команду Убрать изменения для того, чтобы вернуться к нетронутой копии." #. (glossterm) #: ../source/TortoiseGit_en.xml:16079 @@ -14193,13 +14193,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:16111 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Часто используемое сокращение для Subversion." +msgid "A frequently-used abbreviation for Git." +msgstr "Часто используемое сокращение для Git." #. (para) #: ../source/TortoiseGit_en.xml:16114 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Имя собственного протокола Subversion, используемого сервером хранилища svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Имя собственного протокола Git, используемого сервером хранилища svnserve." #. (para) #: ../source/TortoiseGit_en.xml:16123 @@ -14208,8 +14208,8 @@ msgstr "Как обновить-до-ревизии изменя #. (para) #: ../source/TortoiseGit_en.xml:16137 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Эта команда Subversion вносит последние изменения из хранилища в вашу рабочую копию, сливая все сделанные другими изменения с локальными изменениями из рабочей копии." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Эта команда Git вносит последние изменения из хранилища в вашу рабочую копию, сливая все сделанные другими изменения с локальными изменениями из рабочей копии." #. (glossterm) #: ../source/TortoiseGit_en.xml:16145 @@ -14237,26 +14237,26 @@ msgid "translator-translation" msgstr "Перевод" #~ msgid "" -#~ "Subversion uses the / as the path delimiter in all " +#~ "Git uses the / as the path delimiter in all " #~ "internal pathnames, and all pattern matching is done against this style " #~ "of path names. If you want to use a path delimiter in your ignore " #~ "pattern, be sure to use /, and not the Windows " #~ "backslash." #~ msgstr "" -#~ "Subversion использует / (косую черту) как символ-" +#~ "Git использует / (косую черту) как символ-" #~ "разделитель во всех внутренних представлениях путей, и такой стиль " #~ "используется для всех путей, которые сопоставляются с шаблоном. Поэтому, " #~ "если вы желаете задействовать разделитель пути в шаблоне игнорирования, " #~ "убедитесь, что указали /, а не обратную косую черту, " #~ "как в Windows." #~ msgid "" -#~ "Subversion uses this pattern matching against every path presented to it " +#~ "Git uses this pattern matching against every path presented to it " #~ "for action. These paths are generally relative to the directory being " #~ "acted upon for import, add, commit, etc. The matching pattern therefore " #~ "has to take account of the fact that there may or may not be path " #~ "components before the filename." #~ msgstr "" -#~ "Такое сопоставление с шаблоном Subversion применяет для всех путей, " +#~ "Такое сопоставление с шаблоном Git применяет для всех путей, " #~ "которые участвуют в её действиях. Эти пути обычно задаются относительно " #~ "папки, указанной для выполнения операций импорта, добавления, фиксации и " #~ "т.п. В связи с этим шаблон сопоставления должен учитывать, что части пути " @@ -14269,14 +14269,14 @@ msgstr "Перевод" #~ "Fred.c but not subdir/Fred.c. This " #~ "is significant if you add a folder which contains some files that you " #~ "want to be ignored, because those filenames will be preceded with the " -#~ "folder name when Subversion compares them with the ignore pattern." +#~ "folder name when Git compares them with the ignore pattern." #~ msgstr "" #~ "Если в пути присутствуют имена папок, то алгоритм сопоставления их не " #~ "обрезает, так что Fred.c будет соответствовать шаблону " #~ "Fred.*, а subdir/Fred.c - нет. Это " #~ "существенно при добавлении папки, содержащей несколько файлов, которые вы " #~ "желаете игнорировать, так как этим именам файлов будет предшествовать имя " -#~ "папки, когда Subversion будет сопоставлять их с шаблоном игнорирования." +#~ "папки, когда Git будет сопоставлять их с шаблоном игнорирования." #~ msgid "" #~ "The / character is not treated in any special way for " #~ "pattern matching purposes, so the pattern abc*xyz " @@ -14422,14 +14422,14 @@ msgstr "Перевод" #~ "неполной. Также, если на сервере нет базы данных по отслеживанию слияний, " #~ "сбор информации будет очень медленным." #~ msgid "" -#~ "Get the latest version of Subversion from http://" -#~ "subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." #~ msgstr "" -#~ "Загрузите последнюю версию Subversion по адресу http://subversion.tigris.org/servlets/ProjectDocumentList?" +#~ "Загрузите последнюю версию Git по адресу http://Git.tigris.org/servlets/ProjectDocumentList?" #~ "folderID=91." #~ msgid "" #~ "It is beyond the scope of this documentation to detail the installation " @@ -14448,28 +14448,28 @@ msgstr "Перевод" #~ msgstr "Поддержка Cyrus SASL" #, fuzzy #~ msgid "" -#~ "Starting with Subversion 1.5.0, svnserve and TortoiseGit support Cyrus " +#~ "Starting with Git 1.5.0, svnserve and TortoiseGit support Cyrus " #~ "SASL (Simple Authentication and Security Layer) for the svn:// protocol. You can find further information in this subversion " +#~ "literal> protocol. You can find further information in this Git " #~ "app note: Using Cyrus SASL Authentication with SubversionUsing Cyrus SASL Authentication with Git." #~ msgstr "" -#~ "Начиная с Subversion 1.5.0, svnserve и TortoiseGit поддерживают Cyrus " +#~ "Начиная с Git 1.5.0, svnserve и TortoiseGit поддерживают Cyrus " #~ "SASL (Simple Authentication and Security Layer) для протокола " #~ "svn://. Дополнительную информацию можно найти в " -#~ "следующей заметке о применении Subversion: Using Cyrus SASL " -#~ "Authentication with Subversion (Использование аутентификации Cyrus SASL с " -#~ "Subversion)." +#~ "Authentication with Git (Использование аутентификации Cyrus SASL с " +#~ "Git)." #~ msgid "" #~ "If you really need to access a repository through a network share, create " #~ "the repository with FSFS format. If you need to provide server access as " -#~ "well, you will need Subversion Server 1.1 or higher." +#~ "well, you will need Git Server 1.1 or higher." #~ msgstr "" #~ "Если вы действительно нужен доступ к хранилищу через сетевой разделяемый " #~ "ресурс, создайте хранилище в формате FSFS. Если вам необходимо обеспечить " -#~ "также и серверный доступ, вам нужен сервер Subversion версии 1.1 или " +#~ "также и серверный доступ, вам нужен сервер Git версии 1.1 или " #~ "более новой." #~ msgid "" #~ "So if you haven't already created a basic folder structure inside your " @@ -14490,20 +14490,20 @@ msgstr "Перевод" #~ "В этом диалоге вы должны ввести URL-адрес хранилища, в которое хотите " #~ "импортировать ваш проект." #~ msgid "" -#~ "The Subversion import command has limited functionality - you cannot " +#~ "The Git import command has limited functionality - you cannot " #~ "easily pick items for import. Also, the folder you are importing does not " -#~ "become a Subversion working copy - you have to do a separate checkout. " +#~ "become a Git working copy - you have to do a separate checkout. " #~ "But don't worry, there is another way of working which overcomes both " #~ "these shortcomings :-)" #~ msgstr "" -#~ "Возможности команды Subversion 'Импорт' ограничены - вы не можете легко " +#~ "Возможности команды Git 'Импорт' ограничены - вы не можете легко " #~ "выбрать элементы для импорта. Опять же, импортируемая папка не становится " -#~ "рабочей копией Subversion - вам необходимо сделать отдельное извлечение. " +#~ "рабочей копией Git - вам необходимо сделать отдельное извлечение. " #~ "Но не переживайте, есть другой рабочий способ, который преодолевает эти " #~ "дефекты :-)" #~ msgid "" #~ "Note that if you change the URL in an svn:externals " -#~ "property, then next time you update your working copy Subversion will " +#~ "property, then next time you update your working copy Git will " #~ "delete the old external folder and make a fresh checkout, so you will see " #~ "files being Added, rather than being " #~ "Updated as you might have expected. This situation " @@ -14512,7 +14512,7 @@ msgstr "Перевод" #~ "to point to the new tag." #~ msgstr "" #~ "Обратите внимание, если вы изменили URL в свойстве svn:" -#~ "externals, то при следующем обновлении рабочей копии Subversion " +#~ "externals, то при следующем обновлении рабочей копии Git " #~ "удалит старую внешнюю папку и произведёт свежее извлечение, так что файлы " #~ "будут иметь статус добавлено, а не " #~ "обновлено, как вы могли ожидать. Эта ситуация может " @@ -14563,12 +14563,12 @@ msgstr "Перевод" #~ "где его можно задать - это список рассылки." #, fuzzy -#~ msgid "Subversion/TortoiseGit How-To" -#~ msgstr "Свойства Subversion" +#~ msgid "Git/TortoiseGit How-To" +#~ msgstr "Свойства Git" #, fuzzy -#~ msgid "Installing Subversion (server)" -#~ msgstr "Установка Subversion" +#~ msgid "Installing Git (server)" +#~ msgstr "Установка Git" #~ msgid "" #~ "The paths which were selected when the operation was started, eg. the " #~ "paths selected in Explorer when invoking the Commit dialog. If multiple " @@ -14627,7 +14627,7 @@ msgstr "Перевод" #~ msgid "" #~ "When you checkout an existing source tree from the repository, you should " #~ "do so in an empty directory. If you try to check out your source tree " -#~ "into the same directory that you imported from, Subversion will throw an " +#~ "into the same directory that you imported from, Git will throw an " #~ "error message because it will not overwrite the existing unversioned " #~ "files with versioned ones, even if they are identical. You will have to " #~ "check out into a different directory or delete the existing source tree " @@ -14637,7 +14637,7 @@ msgstr "Перевод" #~ "Извлечение существующего дерева исходного кода из хранилища необходимо " #~ "производить только в пустую папку. Если вы попытаетесь извлечь ваше " #~ "дерево исходного кода в ту же папку, из которой вы его импортировали, " -#~ "Subversion выдаст сообщение об ошибке, поскольку она не будет " +#~ "Git выдаст сообщение об ошибке, поскольку она не будет " #~ "перезаписывать существующие неверсированные файлы версированными, даже " #~ "если они одинаковые. Необходимо или произвести извлечение в другую папку, " #~ "или сначала удалить существующее дерево исходного кода. Ещё лучше, " diff --git a/doc/po/TortoiseSVN_sk.po b/doc/po/TortoiseSVN_sk.po index c88967b..f193dca 100644 --- a/doc/po/TortoiseSVN_sk.po +++ b/doc/po/TortoiseSVN_sk.po @@ -24,7 +24,7 @@ msgstr "" "POT-Creation-Date: 2008-12-01 11:10 +0000\n" "PO-Revision-Date: 2008-12-10 15:36+0100\n" "Last-Translator: Oto BREZINA \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,8 +41,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Windows klient pre Subversion" +msgid "A Git client for Windows" +msgstr "Windows klient pre Git" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -122,8 +122,8 @@ msgstr "Uživatelia" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "Táto kniha je písaná pre počitačovo gramotných ľudí, ktorí chcú používať Subversion na správu dát, ale nechcú na to používať príkazový riadok. Kedže TortoiseGit je rošírenie Widows šelu, predpokladá sa, že je užívateľ navyknutý Windows Explorer a vie ako to používať." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "Táto kniha je písaná pre počitačovo gramotných ľudí, ktorí chcú používať Git na správu dát, ale nechcú na to používať príkazový riadok. Kedže TortoiseGit je rošírenie Widows šelu, predpokladá sa, že je užívateľ navyknutý Windows Explorer a vie ako to používať." #. (title) #: ../source/TortoiseGit_en.xml:84 @@ -144,19 +144,19 @@ msgstr "Úvod Vysvetluje čo TortoiseGit je, čo robí, odk #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." msgstr "Napriek tomu, ze väčšina uživateľov si nebudete nastavovať server, nasledovná kapitola sa zoberá ako si taký server nastaviť a je užitočná pre správcov." #. (para) #: ../source/TortoiseGit_en.xml:107 #, fuzzy -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr "Kapitola Úložisko vysvetluje ako nastaviť miestne úložisko, ktoré je užitočné na testovanie Subversion a TortoiseGit použitím jedného počítača. Tiež trochu popisuje správu úložiska, ktorá sa tyka aj úložiska na servery." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr "Kapitola Úložisko vysvetluje ako nastaviť miestne úložisko, ktoré je užitočné na testovanie Git a TortoiseGit použitím jedného počítača. Tiež trochu popisuje správu úložiska, ktorá sa tyka aj úložiska na servery." #. (para) #: ../source/TortoiseGit_en.xml:113 @@ -182,8 +182,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:134 #, fuzzy -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." -msgstr "Prehľad parametrov príkazového riadka dáva informáciu o vsťahu medzi príkazmi TortoiseGit a ich ekvivaltami vo príkazovom klievtovi Subversion svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." +msgstr "Prehľad parametrov príkazového riadka dáva informáciu o vsťahu medzi príkazmi TortoiseGit a ich ekvivaltami vo príkazovom klievtovi Git svn.exe." #. (title) #: ../source/TortoiseGit_en.xml:144 @@ -208,8 +208,8 @@ msgstr "Komunita" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "TortoiseGit aj Subversion sú vyvynuté spoločenstvom ľudí, ktorí na tíchto projektoch pracovali. Pochádzajú z rôznych krajín celého sveta a spojili sa aby vytvorili nádherné programy." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "TortoiseGit aj Git sú vyvynuté spoločenstvom ľudí, ktorí na tíchto projektoch pracovali. Pochádzajú z rôznych krajín celého sveta a spojili sa aby vytvorili nádherné programy." #. (title) #: ../source/TortoiseGit_en.xml:180 @@ -259,13 +259,13 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "Kniha subversion" +msgid "The Git Book" +msgstr "Kniha Git" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "za úvod do Subversion a kapitolu 2, ktorú sme sem skopírovali" +msgid "for the great introduction to Git and its chapter 2 which we copied here" +msgstr "za úvod do Git a kapitolu 2, ktorú sme sem skopírovali" #. (term) #: ../source/TortoiseGit_en.xml:225 @@ -378,12 +378,12 @@ msgstr "Čo je TortoiseGit?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." msgstr "" #. (title) @@ -393,18 +393,18 @@ msgstr "História TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "V roku 2002, Tim Kemp zistil, že Subversion je veľmi dobrý systém na správu verzií, ale mu chýba dobré GUI pre klienta. Myšlienka abu bol klient pre Subversion integrovaný do Windows šrlu bola inšpirovaná podobným klientom pre CVS menovite TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "V roku 2002, Tim Kemp zistil, že Git je veľmi dobrý systém na správu verzií, ale mu chýba dobré GUI pre klienta. Myšlienka abu bol klient pre Git integrovaný do Windows šrlu bola inšpirovaná podobným klientom pre CVS menovite TortoiseCVS." #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Tim študival zdrojové kódy pre TortoiseCVS a použil ich ako základ pre TortoiseGit. Potom začal project, registroval doménu TortoiseGit.org a poskytol zdrojové kódy. V tom čase Stefan Küng hladal dobrý a voľne šíriteľný systém správy verzií a našiel Subversion a zdrojové kódy TortoiseGit. Kedže TortoiseGit ešte nebol vhodný na použitie, tak sa pripojil k projektu a začal programovať. Čoskoro prepísal väčšunu existujúceho kódu a začal pridávať príkazy a funkcie, až z pôvodného kódu neostalo nič." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Tim študival zdrojové kódy pre TortoiseCVS a použil ich ako základ pre TortoiseGit. Potom začal project, registroval doménu TortoiseGit.org a poskytol zdrojové kódy. V tom čase Stefan Küng hladal dobrý a voľne šíriteľný systém správy verzií a našiel Git a zdrojové kódy TortoiseGit. Kedže TortoiseGit ešte nebol vhodný na použitie, tak sa pripojil k projektu a začal programovať. Čoskoro prepísal väčšunu existujúceho kódu a začal pridávať príkazy a funkcie, až z pôvodného kódu neostalo nič." #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." -msgstr "Ako sa Subversion stával stabilným stal sa populárnejším pre viac a viac uživateľov, ktorý začali používať TortoiseGit ako klienta pre Subversion. Uživateľská základňa rýchlo narástla (a rastie každým dňom). Vtedy Lübbe Onken ponúkol pomoc s peknými ikonkami a logom TortoiseGit. Prevzal staristlivosť o stránku a koordinoval preklady." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgstr "Ako sa Git stával stabilným stal sa populárnejším pre viac a viac uživateľov, ktorý začali používať TortoiseGit ako klienta pre Git. Uživateľská základňa rýchlo narástla (a rastie každým dňom). Vtedy Lübbe Onken ponúkol pomoc s peknými ikonkami a logom TortoiseGit. Prevzal staristlivosť o stránku a koordinoval preklady." #. (title) #: ../source/TortoiseGit_en.xml:399 @@ -413,8 +413,8 @@ msgstr "Vlastnosti TortoiseGit " #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." -msgstr "Čo robí TortoiseGit tak dobrým klientom pre Subversion? Tu je krátky zoznam funkcií" +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." +msgstr "Čo robí TortoiseGit tak dobrým klientom pre Git? Tu je krátky zoznam funkcií" #. (term) #: ../source/TortoiseGit_en.xml:406 @@ -453,18 +453,18 @@ msgstr "Stav verziovaných súborovo a adresárov je zobrazený malov prekrývaj #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Jednoduchý prístup k príkazom Subversion" +msgid "Easy access to Git commands" +msgstr "Jednoduchý prístup k príkazom Git" #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." -msgstr "Všetky príkazy Subversion sú prístupne z kontextového meni explorer-u. TortoiseGit si tam pridá svoje podmenu." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgstr "Všetky príkazy Git sú prístupne z kontextového meni explorer-u. TortoiseGit si tam pridá svoje podmenu." #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "Keďže TortoiseGit je klient pre Subversion, radi by sme ukázali niekoľko funkcií samotného Subversion:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" +msgstr "Keďže TortoiseGit je klient pre Git, radi by sme ukázali niekoľko funkcií samotného Git:" #. (term) #: ../source/TortoiseGit_en.xml:460 @@ -473,8 +473,8 @@ msgstr "Verziovanie adresárov" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS sleduje len históriu jednotlivých súborov, kým Subversion zahrňuje virtuálny verziovaný súborovy systém, ktorý sleduje časové zmeny celých adresárových stromov. Verziované su súbory aj adresáre. Vyslekom je, že existujú skutočné klientské príkazy presunúť a kopírovať, ktoré pracujú so súbormi a adresármi." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS sleduje len históriu jednotlivých súborov, kým Git zahrňuje virtuálny verziovaný súborovy systém, ktorý sleduje časové zmeny celých adresárových stromov. Verziované su súbory aj adresáre. Vyslekom je, že existujú skutočné klientské príkazy presunúť a kopírovať, ktoré pracujú so súbormi a adresármi." #. (term) #: ../source/TortoiseGit_en.xml:475 @@ -504,8 +504,8 @@ msgstr "Výber sieťovej vrstvy" #. (para) #: ../source/TortoiseGit_en.xml:499 #, fuzzy -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "Subversion má abstraktný náhľad prístupu k úložisku, čo robí implementovanie nových sieťových mechanizmov ľahkým. Subversion advanced sieťový server je modul pre Apache server, ktorý komunikuje pomocou WebDAL/DeltaV - variantom HTTP. Toto dáva Subversion veľkú výhodu v stabilite a ... a poskytuje rôzne kľúčové vlastnosti; autentifikáciu, autorizáciu, kompresiu prenosu, prehliadanie úložiska. Menší samostatný Subversion server je tiež dostupný. Tento server používa vlastný protokol a môže byť jednoducho tunelovaný cez ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "Git má abstraktný náhľad prístupu k úložisku, čo robí implementovanie nových sieťových mechanizmov ľahkým. Git advanced sieťový server je modul pre Apache server, ktorý komunikuje pomocou WebDAL/DeltaV - variantom HTTP. Toto dáva Git veľkú výhodu v stabilite a ... a poskytuje rôzne kľúčové vlastnosti; autentifikáciu, autorizáciu, kompresiu prenosu, prehliadanie úložiska. Menší samostatný Git server je tiež dostupný. Tento server používa vlastný protokol a môže byť jednoducho tunelovaný cez ssh." #. (term) #: ../source/TortoiseGit_en.xml:516 @@ -514,7 +514,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." msgstr "" #. (term) @@ -524,7 +524,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." msgstr "" #. (term) @@ -534,8 +534,8 @@ msgstr "Upraviteľnosť" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Subversion nie je zaťažený históriou; je impementovaný a súbor zdielaných knižníc v jazyku C s dobre definovaným API. Toto robí zo Subversion dobre udržovateľnú a použiteľnú pre iné aplikácia a jazyky." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." +msgstr "Git nie je zaťažený históriou; je impementovaný a súbor zdielaných knižníc v jazyku C s dobre definovaným API. Toto robí zo Git dobre udržovateľnú a použiteľnú pre iné aplikácia a jazyky." #. (title) #: ../source/TortoiseGit_en.xml:558 @@ -679,22 +679,22 @@ msgstr "" #. (primary) #: ../source/TortoiseGit_en.xml:724 -msgid "Subversion book" -msgstr "Kniha Subversion" +msgid "Git book" +msgstr "Kniha Git" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." msgstr "" #. (title) @@ -715,7 +715,7 @@ msgstr "úložisko" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." msgstr "" #. (title) @@ -725,7 +725,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." msgstr "" #. (para) @@ -800,7 +800,7 @@ msgstr "Riešenie typu Kopírovať-Upraviť-Zlúčiť" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." msgstr "" #. (para) @@ -842,17 +842,17 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" +msgid "What does Git Do?" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" +msgid "Git in Action" msgstr "" #. (title) @@ -867,27 +867,27 @@ msgstr "pracovná kópia" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." msgstr "" #. (para) @@ -912,12 +912,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1058 -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." +msgid "To publish your changes to others, you can use Git's commit command." msgstr "Aby ste zverejnili vaše zmeny ostatným môžete použiť príkaz odovzdať." #. (para) @@ -927,17 +927,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." msgstr "" #. (title) @@ -947,7 +947,7 @@ msgstr "URL úložiska" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" msgstr "" #. (title) @@ -984,8 +984,8 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "Prístup cez WebDAV protokol k Subversion-ovému Apache serveru." +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "Prístup cez WebDAV protokol k Git-ovému Apache serveru." #. (literal) #: ../source/TortoiseGit_en.xml:1141 @@ -1030,7 +1030,7 @@ msgstr "autentifikovaný, šifrovaný TCP/IP prístup pomocou špecialného prot #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." msgstr "" #. (para) @@ -1090,7 +1090,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." msgstr "" #. (para) @@ -1110,7 +1110,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" msgstr "" #. (para) @@ -1172,7 +1172,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." msgstr "" #. (title) @@ -1182,7 +1182,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" msgstr "" #. (para) @@ -1197,7 +1197,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" msgstr "" #. (term) @@ -1237,7 +1237,7 @@ msgstr "Miestne zmenené a zastaralé" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." msgstr "" #. (title) @@ -1247,7 +1247,7 @@ msgstr "Súhrn" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" msgstr "" #. (para) @@ -1257,12 +1257,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." msgstr "" #. (title) @@ -1272,12 +1272,12 @@ msgstr "Nastavenie servera" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." msgstr "" #. (para) @@ -1303,7 +1303,7 @@ msgstr "Apache" # Apache #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" msgstr "" #. (primary) @@ -1315,7 +1315,7 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." msgstr "" #. (term) @@ -1325,7 +1325,7 @@ msgstr "Prezeranie úložiska" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." msgstr "" #. (term) @@ -1407,17 +1407,17 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Inštalácia subversion" +msgid "Installing Git" +msgstr "Inštalácia Git" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." msgstr "" #. (primary) @@ -1429,12 +1429,12 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." msgstr "" #. (para) @@ -1472,12 +1472,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "Na koniec konfiguračného súboru pridajte riadky: \n" "<Location /svn>\n" @@ -1486,12 +1486,12 @@ msgstr "" "SVNParentPath D:\\SVN\n" "#SVNIndexXSLT \"/svnindex.xsl\"\n" "AuthType Basic\n" -"AuthName \"Subversion repositories\"\n" +"AuthName \"Git repositories\"\n" "AuthUserFile passwd\n" "#AuthzSVNAccessFile svnaccessfile\n" "Require valid-user\n" "</Location>\n" -" Toto konfigure Apache, že všetky úložiska Subversion sú umiestnené D:\\SVN. Úložiska sú obsluhované z vonkajšieho sveta cez URL: http://MyServer/svn/ . Prístup je obmedzený pomocou meno/heslo ako je uvedené v súbore passwd." +" Toto konfigure Apache, že všetky úložiska Git sú umiestnené D:\\SVN. Úložiska sú obsluhované z vonkajšieho sveta cez URL: http://MyServer/svn/ . Prístup je obmedzený pomocou meno/heslo ako je uvedené v súbore passwd." #. (para) #: ../source/TortoiseGit_en.xml:1740 @@ -1510,13 +1510,13 @@ msgstr "Opäť reštartuje Apache server." #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "Nasmerujte prehliadač http://MyServer/svn/MyNewRepository (kde MyNewRepository je meno úložiska Subversion, ktoré ste predtím vytvorili). Ak je všetko v poriadku mali by ste byť opýtaný na meho a heslo, potom môžete prezerať obsah vašeho úložiska." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "Nasmerujte prehliadač http://MyServer/svn/MyNewRepository (kde MyNewRepository je meno úložiska Git, ktoré ste predtím vytvorili). Ak je všetko v poriadku mali by ste byť opýtaný na meho a heslo, potom môžete prezerať obsah vašeho úložiska." #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "Teraz máte nastavený Apache a Subversion, ale Apache ešte nevie ako __handle__ Subversion klientov ako je TortoiseGit. Aby Apache vedel, ktorá URL by mala byť použitá pre uložiská Subversion musíte upraviť konfiguračný súbor (typicky umiestnený v c:\\program files\\apache group\\apache2\\conf\\httpd.conf) ľubovoľným textovým editorom (napr.: Notepad): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "Teraz máte nastavený Apache a Git, ale Apache ešte nevie ako __handle__ Git klientov ako je TortoiseGit. Aby Apache vedel, ktorá URL by mala byť použitá pre uložiská Git musíte upraviť konfiguračný súbor (typicky umiestnený v c:\\program files\\apache group\\apache2\\conf\\httpd.conf) ľubovoľným textovým editorom (napr.: Notepad): " #. (primary) #: ../source/TortoiseGit_en.xml:1777 @@ -1554,18 +1554,18 @@ msgstr "http://MyServer/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " -msgstr "znamená, že úložiská Subversion sú prístupné z URL " +msgid "means that the Git repositories are available from the URL " +msgstr "znamená, že úložiská Git sú prístupné z URL " #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "povie Apache, ktorý modul bude zodpovedný za danú URL - v tomto prípade Subversion." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." +msgstr "povie Apache, ktorý modul bude zodpovedný za danú URL - v tomto prípade Git." #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." -msgstr "Pre Subversion 1.3 a novšie, tento parameter povolí zobrazenie všetkých prístupný úložísk pod ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." +msgstr "Pre Git 1.3 a novšie, tento parameter povolí zobrazenie všetkých prístupný úložísk pod ." #. (filename) #: ../source/TortoiseGit_en.xml:1822 @@ -1574,8 +1574,8 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " -msgstr "povie Subversion, aby hľadal úložiská pod " +msgid "tells Git to look for repositories below " +msgstr "povie Git, aby hľadal úložiská pod " #. (entry) #: ../source/TortoiseGit_en.xml:1827 @@ -1599,7 +1599,7 @@ msgstr "určuje, ktorý súbor hesiel má byť použitý pre autentifikáciu" #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" +msgid "Location of the Access file for paths inside a Git repository" msgstr "" #. (entry) @@ -1624,7 +1624,7 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" #. (para) @@ -1662,12 +1662,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1955 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1969 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." msgstr "" #. (title) @@ -1682,7 +1682,7 @@ msgstr "Autorizácia" #. (para) #: ../source/TortoiseGit_en.xml:1984 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." msgstr "" #. (para) @@ -1787,7 +1787,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1819,7 +1819,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2140 -msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." msgstr "" #. (para) @@ -1829,7 +1829,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2150 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." msgstr "" #. (para) @@ -1839,7 +1839,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2166 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." msgstr "" #. (title) @@ -1854,7 +1854,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2184 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." msgstr "" #. (para) @@ -1880,7 +1880,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1980,12 +1980,12 @@ msgstr "SSL a Internet Explorer" #. (para) #: ../source/TortoiseGit_en.xml:2339 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2353 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." msgstr "" #. (para) @@ -2015,7 +2015,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2395 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." msgstr "" #. (para) @@ -2027,7 +2027,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2047,7 +2047,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2424 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." msgstr "" #. (para) @@ -2058,7 +2058,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2440 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" @@ -2077,10 +2077,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2099,7 +2099,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2485 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." msgstr "" #. (para) @@ -2114,23 +2114,23 @@ msgstr "Inštalácia svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2502 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." msgstr "" # Installing svnserve #. (para) #: ../source/TortoiseGit_en.xml:2516 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2522 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2528 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" msgstr "" #. (title) @@ -2192,7 +2192,7 @@ msgstr "Spustiť svnserver ako servis" #. (para) #: ../source/TortoiseGit_en.xml:2624 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." msgstr "" #. (para) @@ -2200,15 +2200,15 @@ msgstr "" msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" @@ -2222,7 +2222,7 @@ msgstr "" msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" #. (para) @@ -2284,7 +2284,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2755 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" msgstr "" #. (title) @@ -2304,12 +2304,12 @@ msgstr "Čo je SASL?" #. (para) #: ../source/TortoiseGit_en.xml:2779 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2787 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." msgstr "" #. (title) @@ -2327,12 +2327,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2810 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2815 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." msgstr "" #. (para) @@ -2407,7 +2407,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2915 -msgid "Further information about svnserve can be found in the Version Control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." msgstr "" #. (title) @@ -2418,7 +2418,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." @@ -2426,12 +2426,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2946 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2951 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." +msgid "If you haven't created a Git repository yet, it's time to do that now." msgstr "" #. (title) @@ -2446,7 +2446,7 @@ msgstr "vytvoriť úložisko" #. (para) #: ../source/TortoiseGit_en.xml:2963 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." msgstr "" #. (title) @@ -2554,7 +2554,7 @@ msgstr "Cesty UNC" # Access #. (para) #: ../source/TortoiseGit_en.xml:3094 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." msgstr "" # Access @@ -2596,7 +2596,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3141 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." msgstr "" #. (para) @@ -2700,7 +2700,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3220 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." msgstr "" #. (para) @@ -2781,7 +2781,7 @@ msgstr "" # backup #. (para) #: ../source/TortoiseGit_en.xml:3332 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." msgstr "" #. (title) @@ -2810,7 +2810,7 @@ msgstr "Klientské (pripnuté) skripty" #. (para) #: ../source/TortoiseGit_en.xml:3357 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." msgstr "" #. (para) @@ -2858,7 +2858,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3411 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." msgstr "" #. (para) @@ -2915,17 +2915,17 @@ msgstr "Sprievodca denného použitia" #. (para) #: ../source/TortoiseGit_en.xml:3457 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3465 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3472 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." msgstr "" #. (para) @@ -2940,12 +2940,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." +msgid "You should know the basics of Git." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3499 -msgid "You should have set up a server and/or have access to a Subversion repository." +msgid "You should have set up a server and/or have access to a Git repository." msgstr "" #. (para) @@ -3140,12 +3140,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3650 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3681 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." msgstr "" # F5 @@ -3224,7 +3224,7 @@ msgstr "Vytvorí nový adresár v úložisku." #. (para) #: ../source/TortoiseGit_en.xml:3736 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "" #. (para) @@ -3339,7 +3339,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3916 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." msgstr "" #. (title) @@ -3367,11 +3367,11 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3940 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" #. (para) @@ -3400,7 +3400,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4016 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." msgstr "" #. (term) @@ -3618,7 +3618,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4298 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." msgstr "" #. (title) @@ -3628,7 +3628,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4309 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." msgstr "" #. (title) @@ -3771,7 +3771,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4495 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." msgstr "" #. (para) @@ -3795,7 +3795,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5324 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #. (title) @@ -3807,7 +3807,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4539 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "" #. (title) @@ -4082,7 +4082,7 @@ msgstr "Miestny súbor už existuje" #. (para) #: ../source/TortoiseGit_en.xml:4868 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." msgstr "" #. (para) @@ -4132,19 +4132,19 @@ msgstr "filename.ext.rNEWREV" #. (para) #: ../source/TortoiseGit_en.xml:4947 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." -msgstr "Toto je súbor, ktorý váš Subversion klient práve získal pri aktualiyovaní vašej pracovnej kópie. Tento súbor odpovedá hlavnej revízií v čase aktualizácie." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgstr "Toto je súbor, ktorý váš Git klient práve získal pri aktualiyovaní vašej pracovnej kópie. Tento súbor odpovedá hlavnej revízií v čase aktualizácie." #. (para) #: ../source/TortoiseGit_en.xml:4902 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" #. (para) @@ -4159,7 +4159,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4981 -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." msgstr "" #. (para) @@ -4210,13 +4210,13 @@ msgstr "ikonky" #. (para) #: ../source/TortoiseGit_en.xml:5033 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "Teraz keď ste získali pracovnú kópiu z úložiska Subversion môžete si pozrieť zmenené ikonky v explorer-y. Toto je jeden y dôvodov prečo je TortoiseGit tak obľúbený. TortoiseGit pridal takzvané prekryvané ikonky na každú ikonku súboru, ktorú prekrýva. Ikonka sa mení v závisloti na stave súboru v Subversion." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." +msgstr "Teraz keď ste získali pracovnú kópiu z úložiska Git môžete si pozrieť zmenené ikonky v explorer-y. Toto je jeden y dôvodov prečo je TortoiseGit tak obľúbený. TortoiseGit pridal takzvané prekryvané ikonky na každú ikonku súboru, ktorú prekrýva. Ikonka sa mení v závisloti na stave súboru v Git." #. (para) #: ../source/TortoiseGit_en.xml:5041 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " Čerstvo získaná pracovná kópia má zelenú značku. To znamená že stav súboru v Subversion je normalny." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " Čerstvo získaná pracovná kópia má zelenú značku. To znamená že stav súboru v Git je normalny." #. (para) #: ../source/TortoiseGit_en.xml:5046 @@ -4230,12 +4230,12 @@ msgstr " Ak pošas aktualizáci #. (para) #: ../source/TortoiseGit_en.xml:5059 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." -msgstr " Ak ste nastavili na súbor vlastnosť svn:needs-lock, Subversion spraví súbor iba na čítanie, kým nezískate zámok pre daný súbor. Súbory iba na čítanie majú toto prekrytie aby ste vedeli, že pred ich úpravou potrebujete získať zámok." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgstr " Ak ste nastavili na súbor vlastnosť svn:needs-lock, Git spraví súbor iba na čítanie, kým nezískate zámok pre daný súbor. Súbory iba na čítanie majú toto prekrytie aby ste vedeli, že pred ich úpravou potrebujete získať zámok." #. (para) #: ../source/TortoiseGit_en.xml:5066 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." msgstr "" #. (para) @@ -4271,7 +4271,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5111 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." msgstr "" #. (title) @@ -4710,7 +4710,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5729 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." msgstr "" #. (para) @@ -4797,7 +4797,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5830 -msgid "View the Subversion properties for the selected item." +msgid "View the Git properties for the selected item." msgstr "" #. (para) @@ -4822,17 +4822,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5852 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5861 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5867 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "" #. (para) @@ -4867,7 +4867,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5922 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." msgstr "" #. (para) @@ -4924,7 +4924,7 @@ msgstr "Dialóg zamykania" #. (para) #: ../source/TortoiseGit_en.xml:5977 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." msgstr "" #. (title) @@ -4959,7 +4959,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6018 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." msgstr "" #. (para) @@ -4969,7 +4969,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6038 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." msgstr "" #. (title) @@ -5223,7 +5223,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6351 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." msgstr "" #. (term) @@ -5515,7 +5515,7 @@ msgstr "pridať" #: ../source/TortoiseGit_en.xml:6697 #, fuzzy msgid "version new files" -msgstr "Vlastnosti Subversion" +msgstr "Vlastnosti Git" #. (title) #. (title) @@ -5622,7 +5622,7 @@ msgstr "značka" #. (para) #: ../source/TortoiseGit_en.xml:6795 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." msgstr "" #. (para) @@ -5711,7 +5711,7 @@ msgstr "Globálný zoznam vylúčenia" #. (para) #: ../source/TortoiseGit_en.xml:6927 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." msgstr "" #. (title) @@ -5721,7 +5721,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6941 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "" #. (title) @@ -5771,12 +5771,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6956 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6996 -msgid "Subversion uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." +msgid "Git uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." msgstr "" #. (para) @@ -5786,12 +5786,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7009 -msgid "Subversion uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." +msgid "Git uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7016 -msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Subversion compares them with the ignore pattern." +msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Git compares them with the ignore pattern." msgstr "" #. (para) @@ -5821,7 +5821,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7051 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " msgstr "" #. (title) @@ -5842,7 +5842,7 @@ msgstr "odstrániť" #. (para) #: ../source/TortoiseGit_en.xml:7068 #, fuzzy -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "TortoiseGitOdovzdať rodičovský adresár." #. (para) @@ -5852,7 +5852,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7092 -msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." msgstr "" #. (para) @@ -5862,12 +5862,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7120 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7134 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." msgstr "" #. (title) @@ -5963,14 +5963,14 @@ msgstr "Miestne zmeny" #. (para) #: ../source/TortoiseGit_en.xml:7263 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7269 #, fuzzy -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" -msgstr "Sú (najmnej) dve možné riešenia na premenovanie súboru bez straty jeho histórie. Je dôležité ho premenovať vrámci subversion. Premenovanie len explorer-i poruší vašu pracovnú kópiu!!!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" +msgstr "Sú (najmnej) dve možné riešenia na premenovanie súboru bez straty jeho histórie. Je dôležité ho premenovať vrámci Git. Premenovanie len explorer-i poruší vašu pracovnú kópiu!!!" #. (para) #: ../source/TortoiseGit_en.xml:7279 @@ -6021,7 +6021,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7325 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." msgstr "" #. (para) @@ -6051,12 +6051,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7357 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7365 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "" #. (title) @@ -6066,7 +6066,7 @@ msgstr "Vymazávanie neverziovaných súborov" #. (para) #: ../source/TortoiseGit_en.xml:7380 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." msgstr "" #. (para) @@ -6163,12 +6163,12 @@ msgstr "vyčistiť" #. (para) #: ../source/TortoiseGit_en.xml:7482 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7493 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." msgstr "" #. (title) @@ -6178,7 +6178,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7505 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." msgstr "" #. (title) @@ -6193,38 +6193,38 @@ msgstr "vlastnosti" #. (title) #: ../source/TortoiseGit_en.xml:7521 -msgid "Explorer property page, Subversion tab" +msgid "Explorer property page, Git tab" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7519 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:7541 -msgid "Subversion Properties" -msgstr "Vlastnosti Subversion" +msgid "Git Properties" +msgstr "Vlastnosti Git" #. (primary) #: ../source/TortoiseGit_en.xml:7543 #, fuzzy -msgid "Subversion properties" -msgstr "Vlastnosti Subversion" +msgid "Git properties" +msgstr "Vlastnosti Git" #. (title) #: ../source/TortoiseGit_en.xml:7549 -msgid "Subversion property page" +msgid "Git property page" msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7547 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7564 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." msgstr "" #. (title) @@ -6270,17 +6270,17 @@ msgstr "Komprimovaná kombinacia predchádyajúcich styroch." #. (para) #: ../source/TortoiseGit_en.xml:7578 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7629 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7639 -msgid "For more information about properties in Subversion see the Special Properties." +msgid "For more information about properties in Git see the Special Properties." msgstr "" #. (title) @@ -6385,12 +6385,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7757 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7762 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." msgstr "" #. (para) @@ -6415,7 +6415,7 @@ msgstr "Odovzdať vlastnosti" #. (para) #: ../source/TortoiseGit_en.xml:7799 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." msgstr "" #. (title) @@ -6425,7 +6425,7 @@ msgstr "Konflikty vo vlastnostiach" #. (para) #: ../source/TortoiseGit_en.xml:7806 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." msgstr "" #. (title) @@ -6467,7 +6467,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7871 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." msgstr "" #. (para) @@ -6555,7 +6555,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8004 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." msgstr "" #. (title) @@ -6587,7 +6587,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8047 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." msgstr "" #. (title) @@ -6729,7 +6729,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8234 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " msgstr "" #. (title) @@ -6755,7 +6755,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8288 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." msgstr "" #. (para) @@ -6785,7 +6785,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8331 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." msgstr "" #. (term) @@ -6797,12 +6797,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8342 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8351 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "" #. (para) @@ -6822,12 +6822,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8381 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8389 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." msgstr "" #. (title) @@ -6873,7 +6873,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8452 -msgid "If you are merging revisions in chunks, the method shown in the subversion book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." +msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." msgstr "" #. (para) @@ -6898,7 +6898,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8497 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." msgstr "" #. (para) @@ -6995,7 +6995,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8607 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" msgstr "" #. (para) @@ -7030,12 +7030,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8668 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8685 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "" #. (para) @@ -7050,7 +7050,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8707 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." msgstr "" #. (title) @@ -7090,7 +7090,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8721 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " msgstr "" #. (para) @@ -7100,7 +7100,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8773 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." msgstr "" #. (title) @@ -7218,17 +7218,17 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8907 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8931 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:8938 -msgid "How Locking Works in Subversion" +msgid "How Locking Works in Git" msgstr "" #. (para) @@ -7243,7 +7243,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8952 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." msgstr "" #. (para) @@ -7253,7 +7253,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8974 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." msgstr "" #. (para) @@ -7323,7 +7323,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9075 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." msgstr "" #. (title) @@ -7338,7 +7338,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9098 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." msgstr "" #. (title) @@ -7348,7 +7348,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9108 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." msgstr "" #. (para) @@ -8020,7 +8020,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9956 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." msgstr "" #. (para) @@ -8035,7 +8035,7 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:9985 -msgid "Exporting a Subversion Working Copy" +msgid "Exporting a Git Working Copy" msgstr "" #. (primary) @@ -8088,11 +8088,11 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10059 #, fuzzy msgid "Exporting single files" -msgstr "Vlastnosti Subversion" +msgstr "Vlastnosti Git" #. (para) #: ../source/TortoiseGit_en.xml:10060 -msgid "The export dialog does not allow exporting single files, even though Subversion can." +msgid "The export dialog does not allow exporting single files, even though Git can." msgstr "" #. (para) @@ -8186,7 +8186,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10154 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." msgstr "" #. (para) @@ -8232,7 +8232,7 @@ msgstr "sledovanie chýb" #. (para) #: ../source/TortoiseGit_en.xml:10194 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." msgstr "" #. (para) @@ -8409,7 +8409,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10499 -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." msgstr "" #. (title) @@ -8459,7 +8459,7 @@ msgstr "ViewCS" #. (para) #: ../source/TortoiseGit_en.xml:10559 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." msgstr "" #. (para) @@ -8514,7 +8514,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10672 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." msgstr "" #. (term) @@ -8584,12 +8584,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10754 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10760 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." msgstr "" #. (para) @@ -8610,12 +8610,12 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:10796 -msgid "Subversion configuration file" -msgstr "Konfiguračný súbor Subversion" +msgid "Git configuration file" +msgstr "Konfiguračný súbor Git" #. (para) #: ../source/TortoiseGit_en.xml:10798 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." msgstr "" #. (term) @@ -8626,12 +8626,12 @@ msgstr "Použiť adresár \"_svn\" namiesto \".svn\"" #. (para) #: ../source/TortoiseGit_en.xml:10825 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10832 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." msgstr "" #. (para) @@ -8731,7 +8731,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:10955 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." msgstr "" #. (term) @@ -9104,12 +9104,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11369 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11374 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." msgstr "" #. (para) @@ -9203,7 +9203,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11476 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." msgstr "" #. (para) @@ -9233,7 +9233,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11521 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." msgstr "" #. (title) @@ -9318,7 +9318,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11637 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." msgstr "" #. (para) @@ -9484,7 +9484,7 @@ msgstr "Auhentifikáčné data" #. (para) #: ../source/TortoiseGit_en.xml:11870 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" msgstr "" #. (para) @@ -9727,7 +9727,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12111 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." msgstr "" #. (para) @@ -9807,8 +9807,8 @@ msgstr "Pre-update" #. (para) #: ../source/TortoiseGit_en.xml:12182 -msgid "Called before the actual Subversion update begins." -msgstr "Volaný predtím ako Subversion začne aktualizáciu." +msgid "Called before the actual Git update begins." +msgstr "Volaný predtím ako Git začne aktualizáciu." #. (term) #. (term) @@ -9921,7 +9921,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12360 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." msgstr "" #. (para) @@ -10031,8 +10031,8 @@ msgstr "Niekoľko málo používaných nastavení je prístupných len cez priam #. (para) #: ../source/TortoiseGit_en.xml:12487 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." -msgstr "Môžete určiť umiestnenie konfiguračného súboru Subversion pomocou HKCU\\Software\\TortoiseGit\\ConfigDir. Toto ovplyvní všetky operacie TortoiseGit." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgstr "Môžete určiť umiestnenie konfiguračného súboru Git pomocou HKCU\\Software\\TortoiseGit\\ConfigDir. Toto ovplyvní všetky operacie TortoiseGit." #. (term) #: ../source/TortoiseGit_en.xml:12496 @@ -10097,8 +10097,8 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:12577 -msgid "Subversion Working Folders" -msgstr "Pracovné adresáre Subversion" +msgid "Git Working Folders" +msgstr "Pracovné adresáre Git" #. (primary) #: ../source/TortoiseGit_en.xml:12579 @@ -10112,7 +10112,7 @@ msgstr "_svn adresár" #. (para) #: ../source/TortoiseGit_en.xml:12584 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." msgstr "" #. (para) @@ -10122,7 +10122,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12595 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." msgstr "" #. (para) @@ -10174,11 +10174,11 @@ msgstr "" #: ../source/TortoiseGit_en.xml:12653 #, fuzzy msgid "version number in files" -msgstr "Konfiguračný súbor Subversion" +msgstr "Konfiguračný súbor Git" #. (para) #: ../source/TortoiseGit_en.xml:12656 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." msgstr "" #. (title) @@ -10188,7 +10188,7 @@ msgstr "Parametre príkazového riadka SubWCRev" #. (para) #: ../source/TortoiseGit_en.xml:12671 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." msgstr "" #. (para) @@ -10697,7 +10697,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12995 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " msgstr "" #. (programlisting) @@ -10845,7 +10845,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13197 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." msgstr "" #. (para) @@ -10855,7 +10855,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13219 -msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." msgstr "" #. (title) @@ -10892,7 +10892,7 @@ msgstr "Presúvanie/Kopírovanie jedného suboru môže byť uskutočnené pomoc #: ../source/TortoiseGit_en.xml:13262 #, fuzzy msgid "The recommended way is by right-dragging the files to the new location. Simply right-click on the files you want to move/copy without releasing the mouse button. Then drag the files to the new location and release the mouse button. A context menu will appear where you can either choose Context MenuSVN Copy versioned files here. or Context MenuSVN Move versioned files here." -msgstr "Doporučený spôsob je požiť right-dragging súborov na nové miesto. Jednoducho right-click na súbory, ktoré chete presunúť/kopírovať a bez pustenia tlačitka ich presuniete na ich nové miesto a pustíte tlačiko Kontextové menu vám umožní si vybrať Context MenuPresunúť vo Subversion sem. alebo Context MenuKopírovať vo Subversion sem." +msgstr "Doporučený spôsob je požiť right-dragging súborov na nové miesto. Jednoducho right-click na súbory, ktoré chete presunúť/kopírovať a bez pustenia tlačitka ich presuniete na ich nové miesto a pustíte tlačiko Kontextové menu vám umožní si vybrať Context MenuPresunúť vo Git sem. alebo Context MenuKopírovať vo Git sem." #. (title) #: ../source/TortoiseGit_en.xml:13285 @@ -10916,7 +10916,7 @@ msgstr "prázdna správa" #. (para) #: ../source/TortoiseGit_en.xml:13295 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." msgstr "" #. (title) @@ -10936,7 +10936,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13317 -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." msgstr "" #. (title) @@ -11084,7 +11084,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13518 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." msgstr "" #. (title) @@ -11152,8 +11152,8 @@ msgstr "Nastavte vlastnosť svn:externals pre adresár vo va #. (para) #: ../source/TortoiseGit_en.xml:13612 #, fuzzy -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." -msgstr "Odovzdajte nový adresár. Teraz keď aktualizujete, Subversion natiahne kópiu toho projektu z úložiska do vašej pracovnej kópie. Podadresáre budú v prípade potreby automaticky vytvorené. Pri každej aktualizácií vašej pracovnej kópie získate aj poslednú verziu pre všetky externé projekty." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgstr "Odovzdajte nový adresár. Teraz keď aktualizujete, Git natiahne kópiu toho projektu z úložiska do vašej pracovnej kópie. Podadresáre budú v prípade potreby automaticky vytvorené. Pri každej aktualizácií vašej pracovnej kópie získate aj poslednú verziu pre všetky externé projekty." #. (para) #: ../source/TortoiseGit_en.xml:13631 @@ -11167,8 +11167,8 @@ msgstr "Použitie vnorenej pracovnej kópie" #. (para) #: ../source/TortoiseGit_en.xml:13640 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" -msgstr "Vytvorte nový adresár vo vašom projekte, ktorý má obsahovať spoločný zdrojový kód, ale nepridajte to do Subversion." +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" +msgstr "Vytvorte nový adresár vo vašom projekte, ktorý má obsahovať spoločný zdrojový kód, ale nepridajte to do Git." #. (para) #: ../source/TortoiseGit_en.xml:13644 @@ -11745,8 +11745,8 @@ msgstr "Kedže všetky príkazy TortoiseGit sú ovládané parametrami príkazov #. (para) #: ../source/TortoiseGit_en.xml:14147 #, fuzzy -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." -msgstr "Pamatajte, že TortoiseGit je GUI (graficke rozhranie) a návod na automatizovanie ukazuje ako sú dialógy TortoiseGit zobrazované, aby zozbierali uživateľské vstupy. Keď chcete napísať skript, ktorý nebude požadovať vstup mali by ste namiesto toho použiť príkazový riadok Subversion." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." +msgstr "Pamatajte, že TortoiseGit je GUI (graficke rozhranie) a návod na automatizovanie ukazuje ako sú dialógy TortoiseGit zobrazované, aby zozbierali uživateľské vstupy. Keď chcete napísať skript, ktorý nebude požadovať vstup mali by ste namiesto toho použiť príkazový riadok Git." #. (title) #. (title) @@ -12360,17 +12360,17 @@ msgstr "CLI" #. (para) #: ../source/TortoiseGit_en.xml:14741 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14750 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14756 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." msgstr "" #. (title) @@ -12429,7 +12429,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14814 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." msgstr "" #. (para) @@ -12463,7 +12463,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14849 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." msgstr "" #. (screen) @@ -12482,7 +12482,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14859 #: ../source/TortoiseGit_en.xml:14947 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." msgstr "" #. (para) @@ -12502,7 +12502,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14874 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." msgstr "" #. (screen) @@ -12664,7 +12664,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15027 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." msgstr "" #. (screen) @@ -12808,7 +12808,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15129 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." msgstr "" #. (para) @@ -12904,7 +12904,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15215 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." msgstr "" #. (title) @@ -12925,7 +12925,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15244 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." msgstr "" #. (para) @@ -12951,12 +12951,12 @@ msgstr " Znamieko plus vám hovor #. (para) #: ../source/TortoiseGit_en.xml:15286 -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15295 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." msgstr "" #. (para) @@ -12976,12 +12976,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15330 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15337 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "" #. (para) @@ -13027,22 +13027,22 @@ msgstr "Zabezpečenie servera pomocou SSL" #. (para) #: ../source/TortoiseGit_en.xml:15407 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15417 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15422 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15428 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" msgstr "" #. (title) @@ -13060,7 +13060,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15449 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." msgstr "" #. (para) @@ -13197,7 +13197,7 @@ msgstr "Skúšanie SSH s TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:15612 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "" #. (para) @@ -13303,8 +13303,8 @@ msgstr "Register" #. (para) #: ../source/TortoiseGit_en.xml:15764 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Príkaz Subversion, ktorý sa používa na pridanie súboru, alebo adresára do pracovnej kópie. Nové objekty budú pridané do úložiska pri odovzdaní." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Príkaz Git, ktorý sa používa na pridanie súboru, alebo adresára do pracovnej kópie. Nové objekty budú pridané do úložiska pri odovzdaní." #. (glossterm) #: ../source/TortoiseGit_en.xml:15772 @@ -13338,23 +13338,23 @@ msgstr "Vetva" #. (para) #: ../source/TortoiseGit_en.xml:15806 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15821 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "Príkaz Suversion, ktorý vytvorí miestnu pracovnú kópiu v prázdnom adresáry stiahnutím verziovaných súborov z úložiska." #. (para) #: ../source/TortoiseGit_en.xml:15830 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15847 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Príkaz Subversion, ktorý posunie zmeny vašej miestnej pracovnej kópie späť do úložiska, vytvoriac novú revíziu." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Príkaz Git, ktorý posunie zmeny vašej miestnej pracovnej kópie späť do úložiska, vytvoriac novú revíziu." #. (glossterm) #: ../source/TortoiseGit_en.xml:15855 @@ -13363,7 +13363,7 @@ msgstr "Konflikt" #. (para) #: ../source/TortoiseGit_en.xml:15857 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "" #. (glossterm) @@ -13373,8 +13373,8 @@ msgstr "Kopírovať" #. (para) #: ../source/TortoiseGit_en.xml:15869 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "V úložisku Subversion môžete vytvoriť kópiu jedného súboru, alebo celej adresárovej vetvy. Tieto sú implementované ako lacné kópie, ktoré sa správo trochu ako odkaz na pôvodný súbor, takže nezaberajú veľa miesta. Vytváranie kópií zachováva históriu jednotlivých kopírovaných objetov, takže môžete sledovať zmeny, ktoré boli vykonané pred vytvorením kópie." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "V úložisku Git môžete vytvoriť kópiu jedného súboru, alebo celej adresárovej vetvy. Tieto sú implementované ako lacné kópie, ktoré sa správo trochu ako odkaz na pôvodný súbor, takže nezaberajú veľa miesta. Vytváranie kópií zachováva históriu jednotlivých kopírovaných objetov, takže môžete sledovať zmeny, ktoré boli vykonané pred vytvorením kópie." #. (para) #: ../source/TortoiseGit_en.xml:15881 @@ -13400,8 +13400,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15912 #, fuzzy -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Súborový systém FS. Vlastný súborový systém Subversion pre úložiská. Môže byť použitý i na zdielom disku. Predvolený u verzie 1.2 a novších." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Súborový systém FS. Vlastný súborový systém Git pre úložiská. Môže byť použitý i na zdielom disku. Predvolený u verzie 1.2 a novších." #. (para) #: ../source/TortoiseGit_en.xml:15921 @@ -13420,8 +13420,8 @@ msgstr "Posledná revízia súboru, alebo adresára v úložiskuPatch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "" #. (glossterm) @@ -13476,8 +13476,8 @@ msgstr "Vlastnosť" #. (para) #: ../source/TortoiseGit_en.xml:16005 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Okrem verziovania, Subversion umožňuje pridať aj verziované metadata - označované ako vlastnosti - ku každému verziovanému súboru a adresáru. Každá vlastnosť má meno a hodnotu, podobne ako kľúče windows registry. Subversion ma niekoľko špeciálnych vlastností pre vnútorné použite, ako je svn:eol-style. TortoiseGit má nietoré tiež, ako je tsvn:logminsize. Možete pridávať vlastné vlastnosti s menom a hodnotou podľa vašej vôle." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Okrem verziovania, Git umožňuje pridať aj verziované metadata - označované ako vlastnosti - ku každému verziovanému súboru a adresáru. Každá vlastnosť má meno a hodnotu, podobne ako kľúče windows registry. Git ma niekoľko špeciálnych vlastností pre vnútorné použite, ako je svn:eol-style. TortoiseGit má nietoré tiež, ako je tsvn:logminsize. Možete pridávať vlastné vlastnosti s menom a hodnotou podľa vašej vôle." #. (para) #: ../source/TortoiseGit_en.xml:16020 @@ -13506,8 +13506,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:16060 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion udržuje kópiu pôvodnej verzie každého súboru, tak ako bol pri poslednej aktualizácií pracovnej kópie. Ak ste urobili zmeny a rozhodli ste sa ich vrátiť, môžete použiť príkaz vrátiť na vrátenie sa k pôvodnej verzií." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git udržuje kópiu pôvodnej verzie každého súboru, tak ako bol pri poslednej aktualizácií pracovnej kópie. Ak ste urobili zmeny a rozhodli ste sa ich vrátiť, môžete použiť príkaz vrátiť na vrátenie sa k pôvodnej verzií." #. (glossterm) #: ../source/TortoiseGit_en.xml:16069 @@ -13541,13 +13541,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:16101 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Často použivaná skratka pre Subversion" +msgid "A frequently-used abbreviation for Git." +msgstr "Často použivaná skratka pre Git" #. (para) #: ../source/TortoiseGit_en.xml:16104 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Meno protokolu pre Subversion použitého v servery úložiska svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Meno protokolu pre Git použitého v servery úložiska svnserve." #. (para) #: ../source/TortoiseGit_en.xml:16113 @@ -13556,8 +13556,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:16127 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "Tento príkaz Subversion stiahne posledné zmeny z úložiska do vašej pracovnej kópie, zlučovaním zmien od ostatných so zmenami vo vašej pracovnej kópií." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "Tento príkaz Git stiahne posledné zmeny z úložiska do vašej pracovnej kópie, zlučovaním zmien od ostatných so zmenami vo vašej pracovnej kópií." #. (glossterm) #: ../source/TortoiseGit_en.xml:16135 @@ -13634,8 +13634,8 @@ msgstr "Slovenčina" #~ msgstr "SVNIndexXSLT \"/svnindex.xsl\"" #~ msgid "AuthType Basic" #~ msgstr "AuthType Basic" -#~ msgid "AuthName \"Subversion repositories\"" -#~ msgstr "AuthName \"Subversion repositories\"" +#~ msgid "AuthName \"Git repositories\"" +#~ msgstr "AuthName \"Git repositories\"" #~ msgid "AuthUserFile passwd" #~ msgstr "AuthUserFile passwd" #~ msgid "AuthzSVNAccessFile" diff --git a/doc/po/TortoiseSVN_sl.po b/doc/po/TortoiseSVN_sl.po index 75ff45e..a580059 100644 --- a/doc/po/TortoiseSVN_sl.po +++ b/doc/po/TortoiseSVN_sl.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2008-09-24 17:15 +0000\n" "PO-Revision-Date: 2008-10-02 19:43+0100\n" "Last-Translator: Matjaz Cepon \n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -33,8 +33,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "Odjemalec za Subversion v operacijskem sistemu Windows" +msgid "A Git client for Windows" +msgstr "Odjemalec za Git v operacijskem sistemu Windows" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -114,8 +114,8 @@ msgstr "Komu je priročnik namenjen" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "Kniga je napisana za računalniško pismene uporabnike, ki želijo uporabljati Subversion, vendar niso vešči dela preko ukazne vrstice. Ker je TortoiseGit razširitev Windowsove lupine, predpostavljamo, da uporabnik pozna Raziskovalca in ga zna uporabljati." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "Kniga je napisana za računalniško pismene uporabnike, ki želijo uporabljati Git, vendar niso vešči dela preko ukazne vrstice. Ker je TortoiseGit razširitev Windowsove lupine, predpostavljamo, da uporabnik pozna Raziskovalca in ga zna uporabljati." #. (title) #: ../source/TortoiseGit_en.xml:84 @@ -134,18 +134,18 @@ msgstr "V poglavju si pogledamo, kaj Torto #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." -msgstr "Poglavje poda nekaj osnov o sistemu za nadzor različic Subversion, ki je podlaga za TortoiseGit. Ta del je izposojen iz dokumentacije Subversion in ponazori različne pristope k vodenju različic datotek in delovanje sistema Subversion." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." +msgstr "Poglavje poda nekaj osnov o sistemu za nadzor različic Git, ki je podlaga za TortoiseGit. Ta del je izposojen iz dokumentacije Git in ponazori različne pristope k vodenju različic datotek in delovanje sistema Git." #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." -msgstr "Čeprav večini uporabnikov sistema Subversion ne bo nikoli potrebno postavljati strežnika, naslednje poglavje opiše, kako se to naredi. Primerno je za skrbnike sistema." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgstr "Čeprav večini uporabnikov sistema Git ne bo nikoli potrebno postavljati strežnika, naslednje poglavje opiše, kako se to naredi. Primerno je za skrbnike sistema." #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr "V poglavju razložimo, kako narediti krajevno skladišče, ki je uporabno za preizkušanje programov Subversion in TortoiseGit z uporabo enega samega računalnika. Poleg tega opišemo osnove skrbništva skladišča, kar se nanaša tudi na skladišča na strežniku." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr "V poglavju razložimo, kako narediti krajevno skladišče, ki je uporabno za preizkušanje programov Git in TortoiseGit z uporabo enega samega računalnika. Poleg tega opišemo osnove skrbništva skladišča, kar se nanaša tudi na skladišča na strežniku." #. (para) #: ../source/TortoiseGit_en.xml:113 @@ -169,8 +169,8 @@ msgstr "Poglavje ponazori, kako lahko kliče #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." -msgstr "Poglavje poda seznam ukazov TortoiseGit in njihovih sorodnih ukazov v odjemalcu Subversion za ukazno vrstico (svn.exe)." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." +msgstr "Poglavje poda seznam ukazov TortoiseGit in njihovih sorodnih ukazov v odjemalcu Git za ukazno vrstico (svn.exe)." #. (title) #: ../source/TortoiseGit_en.xml:144 @@ -194,8 +194,8 @@ msgstr "Skupnost" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "Projekta TortoiseGit in Subversion razvija skupnost ljudi, ki prihajajo iz vseh koncev sveta in ki so se združili, da bi ustvarjali čudovite programe." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "Projekta TortoiseGit in Git razvija skupnost ljudi, ki prihajajo iz vseh koncev sveta in ki so se združili, da bi ustvarjali čudovite programe." #. (title) #: ../source/TortoiseGit_en.xml:180 @@ -244,13 +244,13 @@ msgstr "za pomoč pri dokumentaciji in iskanju napak" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "The Subversion Book" +msgid "The Git Book" +msgstr "The Git Book" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "za izvrsten uvod v sistem Subversion in poglavje številka dve, ki smo ga uporabili v tej knjigi" +msgid "for the great introduction to Git and its chapter 2 which we copied here" +msgstr "za izvrsten uvod v sistem Git in poglavje številka dve, ki smo ga uporabili v tej knjigi" #. (term) #: ../source/TortoiseGit_en.xml:225 @@ -363,13 +363,13 @@ msgstr "Kaj je TortoiseGit?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." -msgstr "TortoiseGit je brezplačen odprtokodni odjemalec za sistem nadzora različic Subversion. TortoiseGit upravlja datoteke in mape skozi čas. Datoteke so shranjene v centralnem skladišču. Skladišče je podobno običajnemu strežniku datotek, s to razliko, da si zapomni vse spremembe, ki so bile kadarkoli narejene na datotekah in mapah. To omogoča, da pridobite starejšo različico datoteke in pogledate skozi zgodovino, kako so se podatki spreminjali in kdo je spremembe naredil. Prav zato marsikdo smatra Subversion in tudi ostale sisteme za nadzor različic kot neke vrste časovni stroj." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." +msgstr "TortoiseGit je brezplačen odprtokodni odjemalec za sistem nadzora različic Git. TortoiseGit upravlja datoteke in mape skozi čas. Datoteke so shranjene v centralnem skladišču. Skladišče je podobno običajnemu strežniku datotek, s to razliko, da si zapomni vse spremembe, ki so bile kadarkoli narejene na datotekah in mapah. To omogoča, da pridobite starejšo različico datoteke in pogledate skozi zgodovino, kako so se podatki spreminjali in kdo je spremembe naredil. Prav zato marsikdo smatra Git in tudi ostale sisteme za nadzor različic kot neke vrste časovni stroj." #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." -msgstr "Nekateri sistemi za nadroz različic so posebej prikrojeni za urejanje strukture izvorne kode in imajo veliko zmožnosti, ki so specifične za razvoj programske opreme - na primer razumevanje programskih jezikov ali dodatna orodja za njhovo gradnjo. To so sistemi SCM (software configuration management). Subversion ni tak sistem; je splošen sistem, ki omogoča urejanje katerokoli zbirke datotek, vključno z datotekami izvorne kode." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgstr "Nekateri sistemi za nadroz različic so posebej prikrojeni za urejanje strukture izvorne kode in imajo veliko zmožnosti, ki so specifične za razvoj programske opreme - na primer razumevanje programskih jezikov ali dodatna orodja za njhovo gradnjo. To so sistemi SCM (software configuration management). Git ni tak sistem; je splošen sistem, ki omogoča urejanje katerokoli zbirke datotek, vključno z datotekami izvorne kode." #. (title) #: ../source/TortoiseGit_en.xml:368 @@ -378,18 +378,18 @@ msgstr "Zgodovina TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "Leta 2002 je Tim Kemp ugotovil, da je Subversion zelo dober sistem za nadzor različic, a brez grafičnega uporabniškega vmesnika. Idejo za odjemalca kot lupino sistema Windows je dobil iz podobnega odjemalca za sistem CVS - TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "Leta 2002 je Tim Kemp ugotovil, da je Git zelo dober sistem za nadzor različic, a brez grafičnega uporabniškega vmesnika. Idejo za odjemalca kot lupino sistema Windows je dobil iz podobnega odjemalca za sistem CVS - TortoiseCVS." #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Tim je preučil izvorno kodo aplikacije TortoiseCVS in jo uporabil kot osnovo za TortoiseGit. Nato je začel s projektom, registriral domeno TortoiseGit.org in objavil izvorno kodo. Med tem časom je Stefan Küng iskal dober brezplačen sistem za nadzor različic in našel Subversion ter izvorno kodo za TortoiseGit. Ker aplikacija še ni bila primerna za uporabo, se je pridružil projektu in začel programirati. Kmalu je na novo napisal večji del obstoječe kode in začel dodajati nove ukaze in zmožnosti. Prvotna koda je kmalu povsem izginila." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Tim je preučil izvorno kodo aplikacije TortoiseCVS in jo uporabil kot osnovo za TortoiseGit. Nato je začel s projektom, registriral domeno TortoiseGit.org in objavil izvorno kodo. Med tem časom je Stefan Küng iskal dober brezplačen sistem za nadzor različic in našel Git ter izvorno kodo za TortoiseGit. Ker aplikacija še ni bila primerna za uporabo, se je pridružil projektu in začel programirati. Kmalu je na novo napisal večji del obstoječe kode in začel dodajati nove ukaze in zmožnosti. Prvotna koda je kmalu povsem izginila." #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." -msgstr "Sistem Subversion je postajal vse bolj stabilen in je pridobival vedno več uporabnikov, ki so uporabljali TortoiseGit kot odjemalca za Subversion. Število uporabnikov je hitro naraščalo (in raste še danes). Takrat je Lübbe Onken ponudil svojo pomoč in izdelal lepe ikone in logotip za TortoiseGit. Ureja tudi spletno stran in prevode." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgstr "Sistem Git je postajal vse bolj stabilen in je pridobival vedno več uporabnikov, ki so uporabljali TortoiseGit kot odjemalca za Git. Število uporabnikov je hitro naraščalo (in raste še danes). Takrat je Lübbe Onken ponudil svojo pomoč in izdelal lepe ikone in logotip za TortoiseGit. Ureja tudi spletno stran in prevode." #. (title) #: ../source/TortoiseGit_en.xml:399 @@ -398,8 +398,8 @@ msgstr "Značilnosti TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." -msgstr "Zakaj je TortoiseGit tako dober odjemalec za Subversion? Tukaj je kratek seznam njegovih značilnosti." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." +msgstr "Zakaj je TortoiseGit tako dober odjemalec za Git? Tukaj je kratek seznam njegovih značilnosti." #. (term) #: ../source/TortoiseGit_en.xml:406 @@ -438,18 +438,18 @@ msgstr "Stanje vsake datoteke pod nadzorom različic nakazuje majhna prekrivna i #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Preprost dostop do ukazov sistema Subversion" +msgid "Easy access to Git commands" +msgstr "Preprost dostop do ukazov sistema Git" #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." -msgstr "Vsi ukazi sistema Subversion so na razpolago v kontekstnem meniju Raziskovalca. TortoiseGit doda tja svoj lasten pomeni." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgstr "Vsi ukazi sistema Git so na razpolago v kontekstnem meniju Raziskovalca. TortoiseGit doda tja svoj lasten pomeni." #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "Ker je TortoiseGit odjemalec za Subversion, vam bomo prikazali tudi nekaj značilnosti samega sistema Subversion:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" +msgstr "Ker je TortoiseGit odjemalec za Git, vam bomo prikazali tudi nekaj značilnosti samega sistema Git:" #. (term) #: ../source/TortoiseGit_en.xml:460 @@ -458,8 +458,8 @@ msgstr "Vodenje različic map" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS upravlja le zgodovino posameznih datotek, Subversion pa ima virtualni datotečni sistem pod nadzorom različic, ki upravlja spremembe na celotnem drevesu map. Pod nadzorom so datoteke in mape. Posledica tega je, da imamo na strani odjemalca na razpolago ukaza premakni in kopiraj, ki delujeta na datotekah in mapah." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS upravlja le zgodovino posameznih datotek, Git pa ima virtualni datotečni sistem pod nadzorom različic, ki upravlja spremembe na celotnem drevesu map. Pod nadzorom so datoteke in mape. Posledica tega je, da imamo na strani odjemalca na razpolago ukaza premakni in kopiraj, ki delujeta na datotekah in mapah." #. (term) #: ../source/TortoiseGit_en.xml:475 @@ -488,8 +488,8 @@ msgstr "Izbira plasti omrežja" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "Subversion je vpeljal abstrakten koncept dostopa do skladišča, kar uporabnikom omogoča, da izdelajo nove omrežne mehanizme. Subversionov napredni mrežni strežnik je modul za spletni strežnik Apache, ki govori narečje protokola HTTP, imenovano WebDAV/DeltaV. To daje sistemu Subversion veliko prednosti s stališča stabilnosti in povezovanja, prinaša pa še številne dodatne zmožnosti, n. pr.: avtentikacijo, avtorizacijo, wire compression in brskanje po skladišču. Na razpolago pa je tudi manjši, samostojen strežnik za Subversion. Strežnik se pogovarja po prilagojenem protokolu, ki se ga preprosto preusmeri preko ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "Git je vpeljal abstrakten koncept dostopa do skladišča, kar uporabnikom omogoča, da izdelajo nove omrežne mehanizme. Gitov napredni mrežni strežnik je modul za spletni strežnik Apache, ki govori narečje protokola HTTP, imenovano WebDAV/DeltaV. To daje sistemu Git veliko prednosti s stališča stabilnosti in povezovanja, prinaša pa še številne dodatne zmožnosti, n. pr.: avtentikacijo, avtorizacijo, wire compression in brskanje po skladišču. Na razpolago pa je tudi manjši, samostojen strežnik za Git. Strežnik se pogovarja po prilagojenem protokolu, ki se ga preprosto preusmeri preko ssh." #. (term) #: ../source/TortoiseGit_en.xml:516 @@ -498,8 +498,8 @@ msgstr "Konsistentno upravljanje s podatki" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." -msgstr "Subversion zapisuje razlike med datotekami z dvojiškim algoritmom za razlikovanje, ki deluje tako na tekstovnih (uporabniku berljivih) kot na dvojiških (uporabniku neberljivih) datotekah. Datoteke obeh tipov so enako stisnjene in shranjene v skladišču, razlike pa se prenašajo v obeh smereh po mreži." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgstr "Git zapisuje razlike med datotekami z dvojiškim algoritmom za razlikovanje, ki deluje tako na tekstovnih (uporabniku berljivih) kot na dvojiških (uporabniku neberljivih) datotekah. Datoteke obeh tipov so enako stisnjene in shranjene v skladišču, razlike pa se prenašajo v obeh smereh po mreži." #. (term) #: ../source/TortoiseGit_en.xml:529 @@ -508,8 +508,8 @@ msgstr "Učinkovita uporaba vej in oznak" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." -msgstr "Cena vej in oznak ni nujno sorazmerna z velikostjo projekta. Subversion ustvari veje in oznake tako, da projekt skopira z uporabo mehanizma, podobnega simbolnim povezavam. Tako ti operaciji trajata zelo kratek (konstanten) čas in zavzameta zelo malo prostora v skladišču." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgstr "Cena vej in oznak ni nujno sorazmerna z velikostjo projekta. Git ustvari veje in oznake tako, da projekt skopira z uporabo mehanizma, podobnega simbolnim povezavam. Tako ti operaciji trajata zelo kratek (konstanten) čas in zavzameta zelo malo prostora v skladišču." #. (term) #: ../source/TortoiseGit_en.xml:542 @@ -518,8 +518,8 @@ msgstr "Možnost vključevanja v druge aplikacije" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Sistem Subversion nima zgodovine. Razvit je kot zbirka knjižnic v jeziku C z dobro definiranim programskim vmesnikom (API). Zato je Subversion zelo primeren za vzdrževanje in uporabo s strani ostalih aplikacij in jezikov." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." +msgstr "Sistem Git nima zgodovine. Razvit je kot zbirka knjižnic v jeziku C z dobro definiranim programskim vmesnikom (API). Zato je Git zelo primeren za vzdrževanje in uporabo s strani ostalih aplikacij in jezikov." #. (title) #: ../source/TortoiseGit_en.xml:558 @@ -663,23 +663,23 @@ msgstr "Osnovni principi" #. (primary) #: ../source/TortoiseGit_en.xml:724 -msgid "Subversion book" -msgstr "Subversion book" +msgid "Git book" +msgstr "Git book" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." -msgstr "To poglavje je rahlo spremenjena verzija istega poglavja v knjigi The Subversion book. Spletna različica knjige je na voljo na tem naslovu: http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." +msgstr "To poglavje je rahlo spremenjena verzija istega poglavja v knjigi The Git book. Spletna različica knjige je na voljo na tem naslovu: http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." -msgstr "To poglavje je kratek uvod v Subversion. Če se z nadzorom različic še niste srečali, potem je to poglavje za vas. Začnemo s splošnimi principi nadzora različic, pregledamo posebnosti sistema Subversion in na enostavnih primerih pogledamo, kako se Subversion uporablja." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." +msgstr "To poglavje je kratek uvod v Git. Če se z nadzorom različic še niste srečali, potem je to poglavje za vas. Začnemo s splošnimi principi nadzora različic, pregledamo posebnosti sistema Git in na enostavnih primerih pogledamo, kako se Git uporablja." #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." -msgstr "Čeprav primeri v tem poglavju prikazujejo, kako si uporabniki delijo programsko izvorno kodo, upoštevajte, da lahko Subversion upravlja katerekoli datoteke - ni omejen samo na pomoč računalniškim programerjem." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." +msgstr "Čeprav primeri v tem poglavju prikazujejo, kako si uporabniki delijo programsko izvorno kodo, upoštevajte, da lahko Git upravlja katerekoli datoteke - ni omejen samo na pomoč računalniškim programerjem." #. (title) #. (title) @@ -699,8 +699,8 @@ msgstr "skladišče" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." -msgstr "Subversion je centraliziran sistem za souporabo informacij. Njegovo bistvo je skladišče, centralno mesto za shranjevanje podatkov. Skladišče shranjuje informacije v obliki drevesne strukture datotečnega sistema, kar je tipična hierarhija datotek in map. S skladiščem se lahko poveže poljubno število odjemalcev in bere ali zapisuje datoteke. S pisanjem podatkov da odjemalec te podatke na voljo drugim; z branjem podatkov odjemalec dobi infomacije od drugih." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgstr "Git je centraliziran sistem za souporabo informacij. Njegovo bistvo je skladišče, centralno mesto za shranjevanje podatkov. Skladišče shranjuje informacije v obliki drevesne strukture datotečnega sistema, kar je tipična hierarhija datotek in map. S skladiščem se lahko poveže poljubno število odjemalcev in bere ali zapisuje datoteke. S pisanjem podatkov da odjemalec te podatke na voljo drugim; z branjem podatkov odjemalec dobi infomacije od drugih." #. (title) #: ../source/TortoiseGit_en.xml:767 @@ -709,8 +709,8 @@ msgstr "Tipičen sistem odjemalec/strežnik" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." -msgstr "Zakaj je to zanimivo? Po dosedanji razlagi izgleda to kot tipičen datotečni strežnik. In v resnici skladišče je neke vrste datotečni strežnik. Subversion je poseben zaradi dejstva, da si zapomni vsako spremembo, ki je bila kadarkoli zapisana: vsako spremembo vsake datoteke, pa tudi spremembe strukture map, n. pr. dodajanje, brisanje in preureditev datotek in map." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgstr "Zakaj je to zanimivo? Po dosedanji razlagi izgleda to kot tipičen datotečni strežnik. In v resnici skladišče je neke vrste datotečni strežnik. Git je poseben zaradi dejstva, da si zapomni vsako spremembo, ki je bila kadarkoli zapisana: vsako spremembo vsake datoteke, pa tudi spremembe strukture map, n. pr. dodajanje, brisanje in preureditev datotek in map." #. (para) #: ../source/TortoiseGit_en.xml:780 @@ -783,8 +783,8 @@ msgstr "Rešitev kopiraj-spremeni-spoji" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." -msgstr "Subversion, CVS in še nekateri drugi sistemi za nadzor različic uporabljajo model kopiraj-spremeni-spoji kot alternativo zaklepanju datotek. Pri tem modelu ustvari vsak odjemalec osebno delovno kopijo datoteke ali projekta. Uporabniki delajo sočasno in spreminjajo krajevne kopije. Nazadnje se zasebne kopije spojijo skupaj v novo, končno verzijo. Sistem za nadzor različic pogosto pomaga pri spajanju, vendar je koncu za pravilno spajanje odgovoren uporabnik." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgstr "Git, CVS in še nekateri drugi sistemi za nadzor različic uporabljajo model kopiraj-spremeni-spoji kot alternativo zaklepanju datotek. Pri tem modelu ustvari vsak odjemalec osebno delovno kopijo datoteke ali projekta. Uporabniki delajo sočasno in spreminjajo krajevne kopije. Nazadnje se zasebne kopije spojijo skupaj v novo, končno verzijo. Sistem za nadzor različic pogosto pomaga pri spajanju, vendar je koncu za pravilno spajanje odgovoren uporabnik." #. (para) #: ../source/TortoiseGit_en.xml:907 @@ -825,18 +825,18 @@ msgstr "Obstaja pa primer, v katerem se model zakleni-spremeni-odkleni izkaže z #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" -msgstr "Kaj naredi Subversion?" +msgid "What does Git Do?" +msgstr "Kaj naredi Git?" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." -msgstr "Subversion po privzetih nastavitvah uporablja model kopiraj-spremeni-spoji in v veliko primerih je to vse, kar potrebujete. Od različice 1.2 naprej pa Subversion podpira tudi zaklepanje datotek. Če torej delate na datotekah, ki se jih ne da spajati ali če ste takšen model prisiljeni uporabljati zaradi pravil, ki veljajo v vašem podjetju, vam Subversion ponuja možnosti, ki jih potrebujete." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." +msgstr "Git po privzetih nastavitvah uporablja model kopiraj-spremeni-spoji in v veliko primerih je to vse, kar potrebujete. Od različice 1.2 naprej pa Git podpira tudi zaklepanje datotek. Če torej delate na datotekah, ki se jih ne da spajati ali če ste takšen model prisiljeni uporabljati zaradi pravil, ki veljajo v vašem podjetju, vam Git ponuja možnosti, ki jih potrebujete." #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" -msgstr "Subversion v akciji" +msgid "Git in Action" +msgstr "Git v akciji" #. (title) #: ../source/TortoiseGit_en.xml:991 @@ -850,28 +850,28 @@ msgstr "delovna kopija" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." -msgstr "O delovnih kopijah ste že brali. Sedaj bomo prikazali, kako jih odjemalec Subversion ustvari in uporablja." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." +msgstr "O delovnih kopijah ste že brali. Sedaj bomo prikazali, kako jih odjemalec Git ustvari in uporablja." #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." -msgstr "Delovna kopija sistema Subversion je običajna struktura map na vašem krajevnem sistemu, ki vsebuje datoteke. Datoteke lahko poljubno spreminjate. Če so to datoteke izvorne kode, lahko iz njih povsem običajno prevedete program. Vaša delovna kopija je vaše zasebno delovno območje: Subversion ne bo v vašo delovno kopijo nikoli vnašal sprememb, ki so jih naredili drugi uporabniki, prav tako vaših sprememb ne bo dal na voljo drugim, razen ko boste to izrecno zahtevali od njega." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgstr "Delovna kopija sistema Git je običajna struktura map na vašem krajevnem sistemu, ki vsebuje datoteke. Datoteke lahko poljubno spreminjate. Če so to datoteke izvorne kode, lahko iz njih povsem običajno prevedete program. Vaša delovna kopija je vaše zasebno delovno območje: Git ne bo v vašo delovno kopijo nikoli vnašal sprememb, ki so jih naredili drugi uporabniki, prav tako vaših sprememb ne bo dal na voljo drugim, razen ko boste to izrecno zahtevali od njega." #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." -msgstr "Ko ste naredili določene spremembe v datotekah v delovni kopiji in jih preverili, uporabite ukaze sistema Subversion, da spremembe objavite (s pisanjem v skladišče), tako da so vidne ostalim sodelavcem, ki delajo na projektu. Če ostali sodelavci naredijo spremembe na datotekah, vam Subversion omogoča, da te spremembe spojite v delovno kopijo (z branjem iz skladišča)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgstr "Ko ste naredili določene spremembe v datotekah v delovni kopiji in jih preverili, uporabite ukaze sistema Git, da spremembe objavite (s pisanjem v skladišče), tako da so vidne ostalim sodelavcem, ki delajo na projektu. Če ostali sodelavci naredijo spremembe na datotekah, vam Git omogoča, da te spremembe spojite v delovno kopijo (z branjem iz skladišča)." #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." -msgstr "Delovna kopija vsebuje tudi nekaj posebnih datotek, ki jih ustvari in vzdržuje Subversion za pomoč pri izvajanju ukazov. Vsak mapa znotraj delovne kopije vsebuje podmapo .svn, ki ji rečemu skrbniška mapa. Datoteke znotraj te mape pomagajo sistemu Subversion prepoznati datoteke, ki vsebujejo neobjavljene spremembe, in datoteke, ki so jih spreminjali drugi uporabniki in so tako zastarele." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgstr "Delovna kopija vsebuje tudi nekaj posebnih datotek, ki jih ustvari in vzdržuje Git za pomoč pri izvajanju ukazov. Vsak mapa znotraj delovne kopije vsebuje podmapo .svn, ki ji rečemu skrbniška mapa. Datoteke znotraj te mape pomagajo sistemu Git prepoznati datoteke, ki vsebujejo neobjavljene spremembe, in datoteke, ki so jih spreminjali drugi uporabniki in so tako zastarele." #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." -msgstr "Tipično skladišče sistema Subversion pogosto vsebuje datoteke (ali izvorno kodo) za več projektov; običajno je vsak projekt podmapa v drevesni strukturi skladišča. Pri takšni ureditvi bo uporabnikova delovna kopija običajno ustrezala določenemu podrevesu skladišča." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgstr "Tipično skladišče sistema Git pogosto vsebuje datoteke (ali izvorno kodo) za več projektov; običajno je vsak projekt podmapa v drevesni strukturi skladišča. Pri takšni ureditvi bo uporabnikova delovna kopija običajno ustrezala določenemu podrevesu skladišča." #. (para) #: ../source/TortoiseGit_en.xml:1038 @@ -895,12 +895,12 @@ msgstr "Če želite ustvariti delovno kopijo, morate prevzetibutton.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." -msgstr "Recimo, da naredite spremembo na datoteki button.c. Ker si mapa .svn zapomni datum spremembe datoteke in izvirno vsebino, Subversion ve, da ste datoteko sprememenili. Vendar pa Subversion ne objavi sprememb, dokler mu tega ne ukažete. Temu rečemo objava (ali vrnitev) sprememb v skladišče." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgstr "Recimo, da naredite spremembo na datoteki button.c. Ker si mapa .svn zapomni datum spremembe datoteke in izvirno vsebino, Git ve, da ste datoteko sprememenili. Vendar pa Git ne objavi sprememb, dokler mu tega ne ukažete. Temu rečemo objava (ali vrnitev) sprememb v skladišče." #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." +msgid "To publish your changes to others, you can use Git's commit command." msgstr "Da bi omogočili dostop do svojih sprememb ostalim, uporabite ukaz objavi." #. (para) @@ -910,18 +910,18 @@ msgstr "Sedaj so spremembe v datoteki button.c objavljene v #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." -msgstr "Predpostavimo, da imate sodelavko Sally, ki je prevzela delovno kopijo /calc sočasno z vami. Ko objavite spremembe v datoteki button.c, se Sallyjina delovna kopija ne spremeni; Subversion spreminja delovne kopije le na zahtevo uporabnika." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." +msgstr "Predpostavimo, da imate sodelavko Sally, ki je prevzela delovno kopijo /calc sočasno z vami. Ko objavite spremembe v datoteki button.c, se Sallyjina delovna kopija ne spremeni; Git spreminja delovne kopije le na zahtevo uporabnika." #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." -msgstr "Za posodobitev projekta Sally od sistema Subversion zahteva, da posodobi njeno delovno kopijo z uporabo ukaza update. Ta spoji vaše spremembe v njeno delovno kopijo, prav tako pa tudi vse ostale spremembe, ki so bile objavljene po njenem prevzemu." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgstr "Za posodobitev projekta Sally od sistema Git zahteva, da posodobi njeno delovno kopijo z uporabo ukaza update. Ta spoji vaše spremembe v njeno delovno kopijo, prav tako pa tudi vse ostale spremembe, ki so bile objavljene po njenem prevzemu." #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." -msgstr "Upoštevajte, da Sally ni potrebno povedati, katere datoteke želi posodobiti; Subversion uporabi informacije v mapi .svn in dodatne informacije iz skladišča, da se odloči, katere datoteke je potrebno posodobiti." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgstr "Upoštevajte, da Sally ni potrebno povedati, katere datoteke želi posodobiti; Git uporabi informacije v mapi .svn in dodatne informacije iz skladišča, da se odloči, katere datoteke je potrebno posodobiti." #. (title) #: ../source/TortoiseGit_en.xml:1103 @@ -930,8 +930,8 @@ msgstr "Naslovi URL skladišča" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" -msgstr "Do skladišč Subversion lahko dostopate na več različnih načinov - na krajevnem disku ali preko različnih omrežnih protokolov. Lokacija skladišča pa je vedno navedena z naslovom URL. Shema naslova URL pove način dostopa:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgstr "Do skladišč Git lahko dostopate na več različnih načinov - na krajevnem disku ali preko različnih omrežnih protokolov. Lokacija skladišča pa je vedno navedena z naslovom URL. Shema naslova URL pove način dostopa:" #. (title) #: ../source/TortoiseGit_en.xml:1112 @@ -967,8 +967,8 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "Dostop do strežnika Apache s sistemom Subversion preko protokola WebDAV." +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "Dostop do strežnika Apache s sistemom Git preko protokola WebDAV." #. (literal) #: ../source/TortoiseGit_en.xml:1141 @@ -1013,8 +1013,8 @@ msgstr "avtenticiran, enkriptiran dostop TCP/IP preko protokola po meri do stre #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." -msgstr "V večini primerov se v sistemu Subversion za naslove URL uporablja standardna sintaksa, kar omogoča, da se ime strežnika in številka vrat pojavljata kot del naslova URL. Metoda dostopa file:// se običajno uporablja za lokalni dostop, možno pa jo je uporabljati tudi za poti UNC. URL je naslednje oblike: file://gostitelj/pat/do/skladišča. Za krajevne dostope dela gostitelj ne navedemo ali pa navedemo localhost. Iz tega razloga se krajevne poti običajno zapisujejo s tremi poševnicami: file:///pat/do/skladišča." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgstr "V večini primerov se v sistemu Git za naslove URL uporablja standardna sintaksa, kar omogoča, da se ime strežnika in številka vrat pojavljata kot del naslova URL. Metoda dostopa file:// se običajno uporablja za lokalni dostop, možno pa jo je uporabljati tudi za poti UNC. URL je naslednje oblike: file://gostitelj/pat/do/skladišča. Za krajevne dostope dela gostitelj ne navedemo ali pa navedemo localhost. Iz tega razloga se krajevne poti običajno zapisujejo s tremi poševnicami: file:///pat/do/skladišča." #. (para) #: ../source/TortoiseGit_en.xml:1181 @@ -1073,8 +1073,8 @@ msgstr "Operacija svn commit objavi spremembe poljubnega šte #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." -msgstr "V skladišču se vsaka objava opravi kot atomična transakcija: upoštevane so vse spremembe v objavi ali pa nobena. Subversion poskuša ohraniti atomičnost zaradi sesutja aplikacij, sistema, težav z omrežjem in ostalih uporabnikov posredovanj." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgstr "V skladišču se vsaka objava opravi kot atomična transakcija: upoštevane so vse spremembe v objavi ali pa nobena. Git poskuša ohraniti atomičnost zaradi sesutja aplikacij, sistema, težav z omrežjem in ostalih uporabnikov posredovanj." #. (para) #: ../source/TortoiseGit_en.xml:1238 @@ -1093,8 +1093,8 @@ msgstr "Globalne številke revizij" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" -msgstr "Za razliko od mnogih drugih sistemov za nadzor različic se revizije v sistemu Subversion nanašajo na celotno drevo, ne na posamezne datoteke. Vsaka številka revizije izbere celotno drevo - določeno stanje skladišča po neki objavi sprememb. Drug način gledanja je ta, da revizija N predstavlja stanje skladišča po N-ti objavi. Ko v sistemu Subversion govorimo o ``reviziji 5 datoteke foo.c'', v resnici mislimo ``Datoteka foo.c, kot se nahaja v reviziji 5''. Upoštevajte, da se v splošnem reviziji N in M neke datoteke ne razlikujeta." +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgstr "Za razliko od mnogih drugih sistemov za nadzor različic se revizije v sistemu Git nanašajo na celotno drevo, ne na posamezne datoteke. Vsaka številka revizije izbere celotno drevo - določeno stanje skladišča po neki objavi sprememb. Drug način gledanja je ta, da revizija N predstavlja stanje skladišča po N-ti objavi. Ko v sistemu Git govorimo o ``reviziji 5 datoteke foo.c'', v resnici mislimo ``Datoteka foo.c, kot se nahaja v reviziji 5''. Upoštevajte, da se v splošnem reviziji N in M neke datoteke ne razlikujeta." #. (para) #: ../source/TortoiseGit_en.xml:1276 @@ -1155,8 +1155,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." -msgstr "Sallyjine spremembe datoteke integer.c se bodo pojavile v vaši delovni kopiji in v datoteki button.c bodo še vedno vaše spremembe. V tem primeru je besedilo datoteke Makefile identično v revizijah 4, 5 in 6, vendar bo Subversion označil vašo delovno kopijo datoteke Makefile s številko revizije 6 in s tem povedal, je datoteka trenutna. Torej: ko boste naredili posodobitev vrhnje datoteke delovne kopije, bo le-ta ustrezala točno eni reviziji v skladišču." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgstr "Sallyjine spremembe datoteke integer.c se bodo pojavile v vaši delovni kopiji in v datoteki button.c bodo še vedno vaše spremembe. V tem primeru je besedilo datoteke Makefile identično v revizijah 4, 5 in 6, vendar bo Git označil vašo delovno kopijo datoteke Makefile s številko revizije 6 in s tem povedal, je datoteka trenutna. Torej: ko boste naredili posodobitev vrhnje datoteke delovne kopije, bo le-ta ustrezala točno eni reviziji v skladišču." #. (title) #: ../source/TortoiseGit_en.xml:1325 @@ -1165,8 +1165,8 @@ msgstr "Kako delovne kopije spremljajo skladišče" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" -msgstr "Za vsako datoteko v delovni kopiji Subversion shrani dve pomembni informaciji v skrbniško področje .svn/:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" +msgstr "Za vsako datoteko v delovni kopiji Git shrani dve pomembni informaciji v skrbniško področje .svn/:" #. (para) #: ../source/TortoiseGit_en.xml:1332 @@ -1180,8 +1180,8 @@ msgstr "časovni žig, ki pove, kdaj je bila krajevna kopija nazadnje posodoblje #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" -msgstr "S temi informacijami in komunikacijo s skladiščem lahko Subversion ugotovi, v katerem od štirih stanj se delovna datoteka nahaja:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" +msgstr "S temi informacijami in komunikacijo s skladiščem lahko Git ugotovi, v katerem od štirih stanj se delovna datoteka nahaja:" #. (term) #: ../source/TortoiseGit_en.xml:1352 @@ -1220,8 +1220,8 @@ msgstr "Krajevno spremenjeno in zastarelo" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." -msgstr "Datoteka je bila spremenjena v delovni kopiji in v skladišču. Ukaz objavi ne bo uspel; prikazalo se bo sporočilo, da je datoteka zastarela. Datoteko je potrebno najprej posodobiti; ukaz posodobi bo poskušal javne spremembe spojiti s krajevnimi. Če Subversion ne more spojiti različic samodejno, reševanje spora prepusti uporabniku." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgstr "Datoteka je bila spremenjena v delovni kopiji in v skladišču. Ukaz objavi ne bo uspel; prikazalo se bo sporočilo, da je datoteka zastarela. Datoteko je potrebno najprej posodobiti; ukaz posodobi bo poskušal javne spremembe spojiti s krajevnimi. Če Git ne more spojiti različic samodejno, reševanje spora prepusti uporabniku." #. (title) #: ../source/TortoiseGit_en.xml:1412 @@ -1230,8 +1230,8 @@ msgstr "Povzetek" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "V tem poglavju smo pregledali nekaj osnovnih principov sistema Subversion:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" +msgstr "V tem poglavju smo pregledali nekaj osnovnih principov sistema Git:" #. (para) #: ../source/TortoiseGit_en.xml:1419 @@ -1240,13 +1240,13 @@ msgstr "Predstavili smo koncept centralnega skladišča, delovne kopije na stran #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." -msgstr "Videli smo nekaj primerov, kako lahko dva sodelavca uporabljata Subversion in model 'kopiraj-spremeni-spoji' za objavljanje sprememb in sprejemanje sprememb drug od drugega." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgstr "Videli smo nekaj primerov, kako lahko dva sodelavca uporabljata Git in model 'kopiraj-spremeni-spoji' za objavljanje sprememb in sprejemanje sprememb drug od drugega." #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." -msgstr "Govorili smo o tem, kako Subversion sledi in upravlja informacije v delovni kopiji." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." +msgstr "Govorili smo o tem, kako Git sledi in upravlja informacije v delovni kopiji." #. (title) #: ../source/TortoiseGit_en.xml:1445 @@ -1255,13 +1255,13 @@ msgstr "Nameščanje strežnika" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." -msgstr "Za uporabo programa TortoiseGit (ali kateregakoli drugega odjemalca za Subversion) potrebuteje prostor, kjer se bodo nahajala skladišča. Lahko jih namestite krajevno in dostopate do njih preko protokola file:// ali pa jih postavite na strežnik in dostopate do njih preko protokolov http:// ali svn://. Strežniška protokola sta lahko ekriptirana. Pri tem uporabite https:// ali svn+ssh://. V tem poglavju so podani koraki nameščanja strežnika na operacijskem sistemu Windows." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgstr "Za uporabo programa TortoiseGit (ali kateregakoli drugega odjemalca za Git) potrebuteje prostor, kjer se bodo nahajala skladišča. Lahko jih namestite krajevno in dostopate do njih preko protokola file:// ali pa jih postavite na strežnik in dostopate do njih preko protokolov http:// ali svn://. Strežniška protokola sta lahko ekriptirana. Pri tem uporabite https:// ali svn+ssh://. V tem poglavju so podani koraki nameščanja strežnika na operacijskem sistemu Windows." #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." -msgstr "Podrobnejše informacije o možnostih strežnika Subversion in izbiri pravilne arhitekture za vaš primer najdete v knjigi The Subversion Book, poglavje Server Configuration." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." +msgstr "Podrobnejše informacije o možnostih strežnika Git in izbiri pravilne arhitekture za vaš primer najdete v knjigi The Git Book, poglavje Server Configuration." #. (para) #: ../source/TortoiseGit_en.xml:1466 @@ -1285,8 +1285,8 @@ msgstr "Apache" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" -msgstr "Najbolj prilagodljiv sistem za Subversion dobite pri uporabi strežnika Apache. Njegova namestitev je sicer nekoliko bolj zahtevna, vendar ima v primerjavi z ostalimi strežniki številne prednosti:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgstr "Najbolj prilagodljiv sistem za Git dobite pri uporabi strežnika Apache. Njegova namestitev je sicer nekoliko bolj zahtevna, vendar ima v primerjavi z ostalimi strežniki številne prednosti:" #. (primary) #. (term) @@ -1297,8 +1297,8 @@ msgstr "WebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." -msgstr "Strežniki Subversion, postavljeni na strežniku Apache, uporabljajo protokol WebDAV, ki ga podpirajo številni ostali programi. Ta omogoča, da naprimer priklopite skladišče kot internetno mapo v Windowsovem Raziskovalcu in do nje dostopate kot do katerekoli druge mape v datotečnem sistemu" +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgstr "Strežniki Git, postavljeni na strežniku Apache, uporabljajo protokol WebDAV, ki ga podpirajo številni ostali programi. Ta omogoča, da naprimer priklopite skladišče kot internetno mapo v Windowsovem Raziskovalcu in do nje dostopate kot do katerekoli druge mape v datotečnem sistemu" #. (term) #: ../source/TortoiseGit_en.xml:1509 @@ -1307,8 +1307,8 @@ msgstr "Brskanje po skladišču" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." -msgstr "V spletni brskalnik lahko vpišete naslov URL skladišča in brskate po vsebini, ne da bi imeli nameščenega odjemalca za Subversion. To omogoča dostop do podatkov precej širšemu krogu uporabnikov." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." +msgstr "V spletni brskalnik lahko vpišete naslov URL skladišča in brskate po vsebini, ne da bi imeli nameščenega odjemalca za Git. To omogoča dostop do podatkov precej širšemu krogu uporabnikov." #. (term) #. (title) @@ -1389,18 +1389,18 @@ msgstr "Za namestitev strežnika Apache potrebujete računalnik s sistemom Windo #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "Namestitev sistema Subversion" +msgid "Installing Git" +msgstr "Namestitev sistema Git" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Prenesite zadnjo različico Win32 dvojiških datotek Subversion za Apache. Prepričajte se, da ste prenesli pravilno različico, drugače boste ob ponovnem zagonu dobili čudna sporočila o napakah. Če uporabljate Apache 2.2.x, uporabite povezavo http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Prenesite zadnjo različico Win32 dvojiških datotek Git za Apache. Prepričajte se, da ste prenesli pravilno različico, drugače boste ob ponovnem zagonu dobili čudna sporočila o napakah. Če uporabljate Apache 2.2.x, uporabite povezavo http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." -msgstr "Poženite namestitveni program za Subversion in sledite navodilom. Če namestitveni program ugotovi, da imate nameščen strežnik Apache, ste že skoraj pri koncu. Če strežnika ne najde, potem vas čaka še nekaj korakov." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgstr "Poženite namestitveni program za Git in sledite navodilom. Če namestitveni program ugotovi, da imate nameščen strežnik Apache, ste že skoraj pri koncu. Če strežnika ne najde, potem vas čaka še nekaj korakov." #. (primary) #. (primary) @@ -1411,13 +1411,13 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "Z Raziskovalcem pojdite v namestitveno mapo Subversion (običajno c:\\program files\\Subversion) in poiščite datoteki /httpd/mod_dav_svn.so in mod_authz_svn.so. Prekopirajte ti datoteki v podmapo modules namestitvene mape strežnika Apache (običajno c:\\program files\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "Z Raziskovalcem pojdite v namestitveno mapo Git (običajno c:\\program files\\Git) in poiščite datoteki /httpd/mod_dav_svn.so in mod_authz_svn.so. Prekopirajte ti datoteki v podmapo modules namestitvene mape strežnika Apache (običajno c:\\program files\\apache group\\apache2\\modules )." #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." -msgstr "Prekopirajte datoteki /bin/libdb*.dll in /bin/intl3_svn.dll iz namestitvene mape Subversion v podmapo bin strežnika Apache." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." +msgstr "Prekopirajte datoteki /bin/libdb*.dll in /bin/intl3_svn.dll iz namestitvene mape Git v podmapo bin strežnika Apache." #. (para) #: ../source/TortoiseGit_en.xml:1677 @@ -1460,12 +1460,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "Na koncu datoteke Config dodajte naslednje vrstice: \n" "<Location /svn>\n" @@ -1474,12 +1474,12 @@ msgstr "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Skladišča Subversion\"\n" +" AuthName \"Skladišča Git\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" S tem nastavite strežnik Apache tako, da so vsa skladišča sistema Subversion znotraj mape D:\\SVN. Zunanjemu svetu so skladišča na voljo na naslovu http://MojStrežnik/svn/ . Dostop je omejen na uporabniÅ¡ka imena/gesla, ki so navedena v datoteki passwd." +" S tem nastavite strežnik Apache tako, da so vsa skladišča sistema Git znotraj mape D:\\SVN. Zunanjemu svetu so skladišča na voljo na naslovu http://MojStrežnik/svn/ . Dostop je omejen na uporabniÅ¡ka imena/gesla, ki so navedena v datoteki passwd." #. (para) #: ../source/TortoiseGit_en.xml:1740 @@ -1503,13 +1503,13 @@ msgstr "Ponovno zaženite storitev (service) Apache." #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "Usmerite spletni brskalnik na http://MojStrežnik/svn/MojeNovoSkladišče (kjer je MojeNovoSkladišče ime skladišča Subversion, ki je ste ga predhodno ustvarili). Če je Å¡lo vse po načrtih, potem vas mora pričakati vnosno polje za uporabniÅ¡o ime in geslo. Po vpisu lahko vidite vsebino skladišča." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "Usmerite spletni brskalnik na http://MojStrežnik/svn/MojeNovoSkladišče (kjer je MojeNovoSkladišče ime skladišča Git, ki je ste ga predhodno ustvarili). Če je Å¡lo vse po načrtih, potem vas mora pričakati vnosno polje za uporabniÅ¡o ime in geslo. Po vpisu lahko vidite vsebino skladišča." #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "Apache in Subversion sta nameščena, vendar Apache Å¡e ne zna delati z odjemalci Subversion, kakrÅ¡en je TortoiseGit. Da poveste strežniku Apache, kateri naslovi URL bodo uporabljeni kot skladišča Subversion, morate popraviti njegovo konfiguracijsko datoteko (običajno se nahaja na c:\\program files\\apache group\\apache2\\conf\\httpd.conf) z urejevalnikom besedila (n. pr. z Beležko): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "Apache in Git sta nameščena, vendar Apache Å¡e ne zna delati z odjemalci Git, kakrÅ¡en je TortoiseGit. Da poveste strežniku Apache, kateri naslovi URL bodo uporabljeni kot skladišča Git, morate popraviti njegovo konfiguracijsko datoteko (običajno se nahaja na c:\\program files\\apache group\\apache2\\conf\\httpd.conf) z urejevalnikom besedila (n. pr. z Beležko): " #. (primary) #: ../source/TortoiseGit_en.xml:1777 @@ -1547,18 +1547,18 @@ msgstr "http://MojStrežnik/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " -msgstr "pomeni, da so skladišča sistema Subversion na voljo na naslovu URL " +msgid "means that the Git repositories are available from the URL " +msgstr "pomeni, da so skladišča sistema Git na voljo na naslovu URL " #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "pove strežniku Apache, kateri modul bo odgovoren za strežbo naslova URL - v tem primeru modul Subversion." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." +msgstr "pove strežniku Apache, kateri modul bo odgovoren za strežbo naslova URL - v tem primeru modul Git." #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." -msgstr "V različicah sistema Subversion 1.3 ali novejÅ¡ih ta ukaz omogoča izpis seznama vse razpoložljivih skladišč v mapi ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." +msgstr "V različicah sistema Git 1.3 ali novejÅ¡ih ta ukaz omogoča izpis seznama vse razpoložljivih skladišč v mapi ." #. (filename) #: ../source/TortoiseGit_en.xml:1822 @@ -1567,8 +1567,8 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " -msgstr "pove sistemu Subversion, naj skladišča išče v mapi " +msgid "tells Git to look for repositories below " +msgstr "pove sistemu Git, naj skladišča išče v mapi " #. (entry) #: ../source/TortoiseGit_en.xml:1827 @@ -1592,8 +1592,8 @@ msgstr "določi datoteko z gesli, ki naj se uporabi za avtentikacijo" #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "lokacija datoteke dostopov za poti v skladiščih Subversion" +msgid "Location of the Access file for paths inside a Git repository" +msgstr "lokacija datoteke dostopov za poti v skladiščih Git" #. (entry) #: ../source/TortoiseGit_en.xml:1861 @@ -1624,7 +1624,7 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "Z uporabno datoteke passwd lahko omejite oziroma dovolite dostop do vseh skladišč naenkrat. Če želite imeti več nadzora nad tem, kateri uporabnik ima pravice v določeni mapi skladišča, odkomentirajte vrstico \n" "#AuthzSVNAccessFile svnaccessfile\n" @@ -1668,13 +1668,13 @@ msgstr "Indeks projektov" #. (para) #: ../source/TortoiseGit_en.xml:1956 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." msgstr "Če ste pri nameščanju nastavili ukaz SVNParentPath, potem vam ni treba spreminjati konfiguracijske datoteke Apache vsakič, ko dodate novo skladišče. Enostavno ustvarite novo skladišče na isti lokaciji, na kateri ste ustvarili prvo skladišče! V naÅ¡em podjetju imamo neposreden dostop do te lokacije na strežniku preko SMB (običajen datotečni dostop sistema Windows). Tako enostavno na tej lokaciji ustvarimo novo mapo, uporabimo ukaz TortoiseGitTukaj ustvari skladišče... in nov projekt ima svoj dom..." #. (para) #: ../source/TortoiseGit_en.xml:1970 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." -msgstr "Če uporabljate Subversion 1.3 ali novejÅ¡o različico, lahko uporabite ukaz SVNListParentPath on. S tem dovolite strežniku Apache, da prikaže seznam vseh projektov, če v brskalnik vpiÅ¡ete korensko pot namesto določenega skladišča." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgstr "Če uporabljate Git 1.3 ali novejÅ¡o različico, lahko uporabite ukaz SVNListParentPath on. S tem dovolite strežniku Apache, da prikaže seznam vseh projektov, če v brskalnik vpiÅ¡ete korensko pot namesto določenega skladišča." #. (title) #: ../source/TortoiseGit_en.xml:1978 @@ -1688,8 +1688,8 @@ msgstr "Avtorizacija" #. (para) #: ../source/TortoiseGit_en.xml:1985 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." -msgstr "Modul mod_authz_svn omogoča podrobno nastavitev pravic dostopa na osnovi uporabniÅ¡kih imen in poti skladišč. Možnost je na voljo pri uporabi strežnika Apache, od različice Subversion 1.3 naprej pa tudi pri uporabi svnserve." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." +msgstr "Modul mod_authz_svn omogoča podrobno nastavitev pravic dostopa na osnovi uporabniÅ¡kih imen in poti skladišč. Možnost je na voljo pri uporabi strežnika Apache, od različice Git 1.3 naprej pa tudi pri uporabi svnserve." #. (para) #: ../source/TortoiseGit_en.xml:1991 @@ -1827,7 +1827,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2094 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1841,7 +1841,7 @@ msgid "" "SSPIOfferBasic On\n" " within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" -"Če želite, da Subversion uporablja ta tip avtentikacije, morate spremeniti vrstico \n" +"Če želite, da Git uporablja ta tip avtentikacije, morate spremeniti vrstico \n" "AuthType Basic\n" " v \n" "AuthType SSPI\n" @@ -1872,8 +1872,8 @@ msgstr "Za vklop varne povezave (SSL) na strežniku preberite AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." -msgstr "Datoteke AuthzSVNAccessFile sistema Subversion so občutljive na velike in male črke pri navajanju uporabniÅ¡kih imen (beseda UPorabnik je torej drugačna kot uporabnik)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgstr "Datoteke AuthzSVNAccessFile sistema Git so občutljive na velike in male črke pri navajanju uporabniÅ¡kih imen (beseda UPorabnik je torej drugačna kot uporabnik)." #. (para) #: ../source/TortoiseGit_en.xml:2146 @@ -1882,8 +1882,8 @@ msgstr "V Microsoftovem svetu domene Windows in uporabniÅ¡ka imena ne ločijo ve #. (para) #: ../source/TortoiseGit_en.xml:2151 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." -msgstr "Ta razlika pa vam lahko ponagaja pri uporabi avtentikacije SSPI. Sistem Subversion dobi domeno Windows in uporabniÅ¡ko ime v natančno takÅ¡ni obliki, kot ju je uporabnik vpisal. Internet Explorer pogosto poÅ¡lje uporabniÅ¡ko ime strežniku Apache v obliki, ki je bila uporabljena pri ustvarjanju računa." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgstr "Ta razlika pa vam lahko ponagaja pri uporabi avtentikacije SSPI. Sistem Git dobi domeno Windows in uporabniÅ¡ko ime v natančno takÅ¡ni obliki, kot ju je uporabnik vpisal. Internet Explorer pogosto poÅ¡lje uporabniÅ¡ko ime strežniku Apache v obliki, ki je bila uporabljena pri ustvarjanju računa." #. (para) #: ../source/TortoiseGit_en.xml:2159 @@ -1892,7 +1892,7 @@ msgstr "Rezultat tega je, da boste mogoče potrebovali vsaj dva vnosa v AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." msgstr "Zapis dostopov in napak strežnika Apache sta vaÅ¡a najboljÅ¡a prijatelja, ko je potrebno reÅ¡evati takÅ¡ne težave. Pomagata vam ugotoviti natančen niz, ki ga dobi modul AuthzSVNAccessFile. Mogoče boste morali poskuÅ¡ati ugotoviti pravilno obliko niza v datoteki svnaccessfile (n. pr. DOMENA\\uporabnik oz. DOMEMA//uporabnik), preden bo sistem res deloval." #. (title) @@ -1907,8 +1907,8 @@ msgstr "Večkratna avtentikacija" #. (para) #: ../source/TortoiseGit_en.xml:2185 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." -msgstr "Določiti je mogoče več virov za avtentikacijo skladišč Subversion. Da bi to delovalo, morate vsako avtentikacijo narediti neavtoritativno. S tem bo Apache pri več virih preveril, ali je sta uporabniÅ¡ko ime in geslo pravilna." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgstr "Določiti je mogoče več virov za avtentikacijo skladišč Git. Da bi to delovalo, morate vsako avtentikacijo narediti neavtoritativno. S tem bo Apache pri več virih preveril, ali je sta uporabniÅ¡ko ime in geslo pravilna." #. (para) #: ../source/TortoiseGit_en.xml:2191 @@ -1937,7 +1937,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1962,7 +1962,7 @@ msgstr "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Skladišča Subversion\"\n" +" AuthName \"Skladišča Git\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# Logiranje preko domen NT.\n" @@ -2089,13 +2089,13 @@ msgstr "SSL in Internet Explorer" #. (para) #: ../source/TortoiseGit_en.xml:2340 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." -msgstr "Če dostop do strežnika zavarujete s protokolom SSL in uporabite avtentikacijo z domeno Windows, boste ugotovili, da brskanje po skladiščih z Internet Explorerjem ne deluje več. Ne skrbite - samo Internet Explorer ni sposoben izvesti avtentikacije. Ostali brskalniki tega problema nimajo, TortoiseGit in ostali odjemalci za Subversion Å¡e vedno lahko izvajajo avtentikacijo." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." +msgstr "Če dostop do strežnika zavarujete s protokolom SSL in uporabite avtentikacijo z domeno Windows, boste ugotovili, da brskanje po skladiščih z Internet Explorerjem ne deluje več. Ne skrbite - samo Internet Explorer ni sposoben izvesti avtentikacije. Ostali brskalniki tega problema nimajo, TortoiseGit in ostali odjemalci za Git Å¡e vedno lahko izvajajo avtentikacijo." #. (para) #: ../source/TortoiseGit_en.xml:2354 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." -msgstr "v konfiguracijski datoteki Apache definirate ločen ukaz <Location /path> in dodate vrstico SSPIBasicPreferred On. To omogoči avtentikacijo preko Internet Explorerja, vendar pa ostali brskalniki in odjemalci za Subversion ne bodo mogli izvajati avtentikacije na tej lokaciji." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." +msgstr "v konfiguracijski datoteki Apache definirate ločen ukaz <Location /path> in dodate vrstico SSPIBasicPreferred On. To omogoči avtentikacijo preko Internet Explorerja, vendar pa ostali brskalniki in odjemalci za Git ne bodo mogli izvajati avtentikacije na tej lokaciji." #. (para) #: ../source/TortoiseGit_en.xml:2364 @@ -2129,8 +2129,8 @@ msgstr "Vsiljevanje dostopa SSL" #. (para) #: ../source/TortoiseGit_en.xml:2396 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." -msgstr "Če ste nastavili protokol SSL, da bi bili dostopi do skladišč bolj varni, onemogočite navaden - ne-SSL (http) dostop in dovolite le dostop https. To naredite tako, da dodate nov ukaz v Subversion blok <Location>: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." +msgstr "Če ste nastavili protokol SSL, da bi bili dostopi do skladišč bolj varni, onemogočite navaden - ne-SSL (http) dostop in dovolite le dostop https. To naredite tako, da dodate nov ukaz v Git blok <Location>: SSLRequireSSL." #. (para) #: ../source/TortoiseGit_en.xml:2403 @@ -2141,7 +2141,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2154,7 +2154,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Skladišča Subversion\"\n" +" AuthName \"Skladišča Git\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2173,8 +2173,8 @@ msgstr "Prispevek je na dopisni seznam poslal Nigel Green. Hvala!" #. (para) #: ../source/TortoiseGit_en.xml:2425 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." -msgstr "V določenih primerih morate na enem strežniku ustvariti dva navidezna gostitelja SSL: prvega za javni dostop dostop preko interneta brez zahteve po certifikatu, drugega za varen dostop s certifikatom, ki poganja strežnik Subversion." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." +msgstr "V določenih primerih morate na enem strežniku ustvariti dva navidezna gostitelja SSL: prvega za javni dostop dostop preko interneta brez zahteve po certifikatu, drugega za varen dostop s certifikatom, ki poganja strežnik Git." #. (para) #: ../source/TortoiseGit_en.xml:2431 @@ -2184,11 +2184,11 @@ msgstr "Če odseku per-server v konfiguraciji strežnika Ap #. (para) #: ../source/TortoiseGit_en.xml:2441 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" -"Zagato reÅ¡imo tako, da dodano naslednji ukaz navideznemu gostitelju, ki ga želimo uporabljati za Subversion: \n" +"Zagato reÅ¡imo tako, da dodano naslednji ukaz navideznemu gostitelju, ki ga želimo uporabljati za Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " S tem dostop do mape dovolimo le uporabnjikom, ki so uporabili veljaven certifikat." @@ -2206,10 +2206,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2231,10 +2231,10 @@ msgstr "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Navidezni gostitelj za SUBVERSION\n" +"### Navidezni gostitelj za Git\n" "### (zahteva certifikat)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"korenska mapa za subversion\">\n" +" <Directory \"korenska mapa za Git\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2252,8 +2252,8 @@ msgstr "Strežnik svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2486 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." -msgstr "Včasih strežnika Apache ne morete uporabiti. Na srečo Subversion vsebuje Svnserve - samostojen mini strežnik, ki uporablja protokol po meri preko običajne povezave TCP/IP." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgstr "Včasih strežnika Apache ne morete uporabiti. Na srečo Git vsebuje Svnserve - samostojen mini strežnik, ki uporablja protokol po meri preko običajne povezave TCP/IP." #. (para) #: ../source/TortoiseGit_en.xml:2492 @@ -2267,23 +2267,23 @@ msgstr "Nameščanje svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2503 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." -msgstr "NajnovejÅ¡o različico sistema Subversion prenesite z naslova http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Prenesete pa lahko tudi namestitveni program iz strežnika CollabNet na naslovu http://www.collab.net/downloads/subversion. Namestitveni program namesti svnserve kot storitev Windows, vsebuje pa tudi nekaj orodij, ki jih potrebujete za varno delovanje preko SASL." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgstr "NajnovejÅ¡o različico sistema Git prenesite z naslova http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Prenesete pa lahko tudi namestitveni program iz strežnika CollabNet na naslovu http://www.collab.net/downloads/Git. Namestitveni program namesti svnserve kot storitev Windows, vsebuje pa tudi nekaj orodij, ki jih potrebujete za varno delovanje preko SASL." #. (para) #: ../source/TortoiseGit_en.xml:2517 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." -msgstr "Če je Subversion že nameščen in svnserve trenutno teče, ga morate pred nadaljevanjem zaustaviti." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." +msgstr "Če je Git že nameščen in svnserve trenutno teče, ga morate pred nadaljevanjem zaustaviti." #. (para) #: ../source/TortoiseGit_en.xml:2523 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." -msgstr "Zaženite namestitvni program Subversion. Če nameščate Subversion na strežniku (priporočamo), lahko korak 4 preskočite." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." +msgstr "Zaženite namestitvni program Git. Če nameščate Git na strežniku (priporočamo), lahko korak 4 preskočite." #. (para) #: ../source/TortoiseGit_en.xml:2529 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "Odprite Raziskovalca, pojdite na namestitveno mapo Subversion (običajno C:\\Program Files\\Subversion) in v mapi bin poiščite datoteke svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll in ssleay32.dll - prekopirajte jih ali pa prekopirajte celopno mapo bin v mapo na vaÅ¡em strežniku, n. pr. c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "Odprite Raziskovalca, pojdite na namestitveno mapo Git (običajno C:\\Program Files\\Git) in v mapi bin poiščite datoteke svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll in ssleay32.dll - prekopirajte jih ali pa prekopirajte celopno mapo bin v mapo na vaÅ¡em strežniku, n. pr. c:\\svnserve" #. (title) #: ../source/TortoiseGit_en.xml:2551 @@ -2353,36 +2353,36 @@ msgstr "Zaženite svnserve kot storitev" #. (para) #: ../source/TortoiseGit_en.xml:2625 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." -msgstr "Poganjanje svnserve kot nek uporabnik običajno ni najboljÅ¡a reÅ¡itev. To pomeni, da mora biti uporabnik stalno prijavljen na strežniku, prav tako se mora uporabnik prijaviti po ponovnem zagonu. BoljÅ¡i način je poganjanje svnserve kot storitev (service) Windows. Od različice Subversion 1.4 se svnserve lahko namesti kot domorodna storitev (native windows service)." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." +msgstr "Poganjanje svnserve kot nek uporabnik običajno ni najboljÅ¡a reÅ¡itev. To pomeni, da mora biti uporabnik stalno prijavljen na strežniku, prav tako se mora uporabnik prijaviti po ponovnem zagonu. BoljÅ¡i način je poganjanje svnserve kot storitev (service) Windows. Od različice Git 1.4 se svnserve lahko namesti kot domorodna storitev (native windows service)." #. (para) #: ../source/TortoiseGit_en.xml:2632 msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Za namestitev svnserve kot domorodno storitev (native windows service) izvrÅ¡ite naslednji ukaz v eni vrstici. S tem ustvarite storitev, ki se samodejno zažene ob zagonu sistema. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " Če katera od poti vsebuje presledke, morate uporabiti poÅ¡evnice in navednice. Primer: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " Ko ste storitev ustvarili, jih lahko dodate tudi opis. Le ta se potem pojavi v upravljalcu storitev (Windows Service Manager). \n" -"sc description svnserve \"Strežnik Subversion (svnserve)\"\n" +"sc description svnserve \"Strežnik Git (svnserve)\"\n" "" #. (para) @@ -2395,11 +2395,11 @@ msgstr "Pazite na nekoliko nenavadno obliko ukaza sc. Pri pod msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Microsoft po novem priporoča, da se storitve poganjajo pod računom Lokalna storitev (Local Service) ali Omrežna storitev (Network Service). Preverite The Services and Service Accounts Security Planning Guide. Za ustvarjanje storitve pod računom Lokalna storitev dodajte zgornjemu primeru naslednjo vrstico. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" UpoÅ¡tevajte, da morate dodati računu potrebne pravice za Subversion in skladišča, prav tako pa tudi za vse aplikacije, ki jih kličejo ukazne datoteke akcij. Vgrajena skupina za to se imenuje \"LOCAL SERVICE\"." +" UpoÅ¡tevajte, da morate dodati računu potrebne pravice za Git in skladišča, prav tako pa tudi za vse aplikacije, ki jih kličejo ukazne datoteke akcij. Vgrajena skupina za to se imenuje \"LOCAL SERVICE\"." #. (para) #: ../source/TortoiseGit_en.xml:2679 @@ -2477,8 +2477,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2756 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" -msgstr "Če vzdržujete več skladišč, bo uporaba iste baze gesel olajÅ¡ala avtentikacijo uporabnikom, saj ima TortoiseGit možnost, da uporabniÅ¡ko ime in geslo shrani v predpomnilnik. Tako ju je potrebno vnesti le enkrat. Več informacij o tem najdete v The Subversion book v poglavjih Create a 'users' file and realm in Client Credentials Caching" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgstr "Če vzdržujete več skladišč, bo uporaba iste baze gesel olajÅ¡ala avtentikacijo uporabnikom, saj ima TortoiseGit možnost, da uporabniÅ¡ko ime in geslo shrani v predpomnilnik. Tako ju je potrebno vnesti le enkrat. Več informacij o tem najdete v The Git book v poglavjih Create a 'users' file and realm in Client Credentials Caching" #. (title) #: ../source/TortoiseGit_en.xml:2774 @@ -2497,13 +2497,13 @@ msgstr "Kaj je SASL?" #. (para) #: ../source/TortoiseGit_en.xml:2780 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." msgstr "The Cyrus Simple Authentication and Security Layer je odprtokodni projekt univerze Carnegie Mellon, ki kateremukoli protokolu doda generično avtentikacijo in enkripcijo. Od različice 1.5 naprej znata to knjižnico uporabljati tako svnserve kot odjemalec TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:2788 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." -msgstr "Za več informacij o možnostih, ki so na voljo, preberite The Subversion Book, poglavje Using svnserve with SASL. Če pa želite zgolj najti način, kako enostavno postaviti varno avtentikacijo in enkripcijo na strežniku Windows, tako da bo vaÅ¡e skladišče varno dostopno preko interneta, berite naprej." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgstr "Za več informacij o možnostih, ki so na voljo, preberite The Git Book, poglavje Using svnserve with SASL. Če pa želite zgolj najti način, kako enostavno postaviti varno avtentikacijo in enkripcijo na strežniku Windows, tako da bo vaÅ¡e skladišče varno dostopno preko interneta, berite naprej." #. (title) #: ../source/TortoiseGit_en.xml:2801 @@ -2523,13 +2523,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2811 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." -msgstr "Nato ustvarite datoteko svn.conf na primerni lokaciji - ponavadi je to v namestitveni mapi Subversion." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." +msgstr "Nato ustvarite datoteko svn.conf na primerni lokaciji - ponavadi je to v namestitveni mapi Git." #. (para) #: ../source/TortoiseGit_en.xml:2816 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." -msgstr "Nazadnje ustvarite vnose v registru, ki SASL povejo, kje naj najde stvari. Ustvarite vnos [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library], vanj pa dodajte dve novi vrednosti (niz/string): SearchPath nastavite na mapo, ki vsebuje vtičnike sasl*.dll (običajno je to namestitvena mapa Subversion), in ConfFile nastavite na mapo, ki vsebuje datoteko svn.conf. Če ste za namestitev uporabili namestitveni program s strežnika CollabNet, imate te vnose že v registru." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgstr "Nazadnje ustvarite vnose v registru, ki SASL povejo, kje naj najde stvari. Ustvarite vnos [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library], vanj pa dodajte dve novi vrednosti (niz/string): SearchPath nastavite na mapo, ki vsebuje vtičnike sasl*.dll (običajno je to namestitvena mapa Git), in ConfFile nastavite na mapo, ki vsebuje datoteko svn.conf. Če ste za namestitev uporabili namestitveni program s strežnika CollabNet, imate te vnose že v registru." #. (para) #: ../source/TortoiseGit_en.xml:2828 @@ -2618,8 +2618,8 @@ msgstr "Osnovna navodila za postavitev strežnika so podana v poglavju Version Control with Subversion." -msgstr "Več informacij o svnserve lahko dobite na naslovu Version Control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." +msgstr "Več informacij o svnserve lahko dobite na naslovu Version Control with Git." #. (title) #: ../source/TortoiseGit_en.xml:2924 @@ -2629,25 +2629,25 @@ msgstr "Avtorizacija svnserve na osnovi poti" #. (para) #: ../source/TortoiseGit_en.xml:2925 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" -"Od različice Subversion 1.3 najprej svnserve omogoča uporabo istega modula mod_authz_svn za avtorizacijo na osnovi poti, kot je na voljo v strežniku Apache. Spremeniti morate datoteko conf/svnserve.conf v mapi skladišča in dodati vrstico, ki pove, kje se nahaja avtorizacijska datoteka. \n" +"Od različice Git 1.3 najprej svnserve omogoča uporabo istega modula mod_authz_svn za avtorizacijo na osnovi poti, kot je na voljo v strežniku Apache. Spremeniti morate datoteko conf/svnserve.conf v mapi skladišča in dodati vrstico, ki pove, kje se nahaja avtorizacijska datoteka. \n" "[general]\n" "authz-db = authz\n" " authz je datoteka, ki jo ustvarite za določanje pravic dostopa. Za vsako skladišče lahko ustvarite svojo datoteko, lahko pa uporabite skupno datoteko za več skladišč. Preberite , kjer je opisana oblika datoteke." #. (para) #: ../source/TortoiseGit_en.xml:2947 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." -msgstr "Ne glede na uporabljen protokol za dostop do skladišča morate vedno ustvariti vsaj eno skladišče. To lahko storite preko ukazne vrstice (Subversion) ali preko grafičnega vmesnika (TortoiseGit)." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." +msgstr "Ne glede na uporabljen protokol za dostop do skladišča morate vedno ustvariti vsaj eno skladišče. To lahko storite preko ukazne vrstice (Git) ali preko grafičnega vmesnika (TortoiseGit)." #. (para) #: ../source/TortoiseGit_en.xml:2952 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "Če Å¡e niste ustvarili skladišča Subversion, je sedaj čas, da to storite." +msgid "If you haven't created a Git repository yet, it's time to do that now." +msgstr "Če Å¡e niste ustvarili skladišča Git, je sedaj čas, da to storite." #. (title) #: ../source/TortoiseGit_en.xml:2960 @@ -2661,8 +2661,8 @@ msgstr "ustvari skladišče" #. (para) #: ../source/TortoiseGit_en.xml:2964 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." -msgstr "Skladišče lahko ustvarite s sistemom FSFS ali s starejÅ¡im, vendar stabilnim sistemom Berkeley Database (BDB). Sistem FSFS je hitrejÅ¡i in sedaj brez težav deluje na mapah skupne rabe v omrežju in sistemu Windows 98. Sistem BDB smo včasih smatrali za stabilnejÅ¡ega zaradi daljÅ¡e uporabe, vendar ta argument ne drži več, saj se FSFS uporablja že več let. Za več informacij preberite Choosing a Data Store v knjigi The Subversion Book." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." +msgstr "Skladišče lahko ustvarite s sistemom FSFS ali s starejÅ¡im, vendar stabilnim sistemom Berkeley Database (BDB). Sistem FSFS je hitrejÅ¡i in sedaj brez težav deluje na mapah skupne rabe v omrežju in sistemu Windows 98. Sistem BDB smo včasih smatrali za stabilnejÅ¡ega zaradi daljÅ¡e uporabe, vendar ta argument ne drži več, saj se FSFS uporablja že več let. Za več informacij preberite Choosing a Data Store v knjigi The Git Book." #. (title) #: ../source/TortoiseGit_en.xml:2979 @@ -2773,8 +2773,8 @@ msgstr "Poti UNC" #. (para) #: ../source/TortoiseGit_en.xml:3095 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." -msgstr "Za dostop do krajevnega skladišča potrebujete le pot do skladišča. Zapomnite si, da Subversion pričakuje pot do skladišč oblike file:///C:/SkladiščeSVN/. UpoÅ¡tevajte, da morate uporabljati poÅ¡evnico in ne obrnjeno poÅ¡evnico." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgstr "Za dostop do krajevnega skladišča potrebujete le pot do skladišča. Zapomnite si, da Git pričakuje pot do skladišč oblike file:///C:/SkladiščeSVN/. UpoÅ¡tevajte, da morate uporabljati poÅ¡evnico in ne obrnjeno poÅ¡evnico." #. (para) #: ../source/TortoiseGit_en.xml:3101 @@ -2784,7 +2784,7 @@ msgstr "Za dostop do skladišča na mapi v skupni rabi v omrežju lahko uporabit #. (para) #: ../source/TortoiseGit_en.xml:3108 msgid "Prior to SVN 1.2, UNC paths had to be given in the more obscure form file:///\\ServerName/path/to/repos. This form is still supported, but not recommended." -msgstr "Pred različico Subversion 1.2 so morale biti poti UNC podane v nekoliko bolj obskurni obliki file:///\\ImeStrežnika/pot/do/skladišča. Ta oblika je Å¡e vedno možna, vendar ni priporočljiva." +msgstr "Pred različico Git 1.2 so morale biti poti UNC podane v nekoliko bolj obskurni obliki file:///\\ImeStrežnika/pot/do/skladišča. Ta oblika je Å¡e vedno možna, vendar ni priporočljiva." #. (para) #: ../source/TortoiseGit_en.xml:3115 @@ -2813,8 +2813,8 @@ msgstr "Prva težava je, da uporabniku omogočite popoln dostop do skladišča, #. (para) #: ../source/TortoiseGit_en.xml:3142 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." -msgstr "Druga težava je, da vsi omrežni protokoli ne omogočajo zaklepanja datotek, ki ga Subversion za svoje delovanje potrebuje. Zato se skladišče lahko pokvari. Mogoče se to ne bo zgodilo takoj, vendar bosta slej ko prej dva uporabnika dostopala do skladišča istočasno." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgstr "Druga težava je, da vsi omrežni protokoli ne omogočajo zaklepanja datotek, ki ga Git za svoje delovanje potrebuje. Zato se skladišče lahko pokvari. Mogoče se to ne bo zgodilo takoj, vendar bosta slej ko prej dva uporabnika dostopala do skladišča istočasno." #. (para) #: ../source/TortoiseGit_en.xml:3148 @@ -2839,7 +2839,7 @@ msgstr "Preden uvozite podatke v skladišče, premislite, kako jih boste organiz #. (para) #: ../source/TortoiseGit_en.xml:3170 msgid "There are some standard, recommended ways to organize a repository. Most people create a trunk directory to hold the main line of development, a branches directory to contain branch copies, and a tags directory to contain tag copies. If a repository holds only one project, then often people create these top-level directories:" -msgstr "Obstaja nekaj standardnih, priporočenim načinov, kako organizirati skladišče Subversion. Večina ljudi naredi mapo trunk za glavno vejo razvoja, mapo branches za stranske veje in mapo tags, ki vsebuje oznake. Če se v skladišču nahaja samo en projekt, uporabniki pogosto ustvarijo naslednjo strukture vrhnjih map:" +msgstr "Obstaja nekaj standardnih, priporočenim načinov, kako organizirati skladišče Git. Večina ljudi naredi mapo trunk za glavno vejo razvoja, mapo branches za stranske veje in mapo tags, ki vsebuje oznake. Če se v skladišču nahaja samo en projekt, uporabniki pogosto ustvarijo naslednjo strukture vrhnjih map:" #. (screen) #: ../source/TortoiseGit_en.xml:3179 @@ -2917,8 +2917,8 @@ msgstr "Če izberete izgled /trunk /tags /branches, to ne p #. (para) #: ../source/TortoiseGit_en.xml:3221 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." -msgstr "Za nepovezane projekte boste verjetno uporabili različna skladišča. Ko objavite spremembe, se spremeni Å¡tevilka revizije celotnega skladišča, ne Å¡tevilka revizije projekta. Če imate v enem skladišču dva projekta, lahko to vodi do velikih \"lukenj\" pri Å¡tevilkah revizij. Projekta Subversion in TortoiseGit se nahajata na istem strežniku, vendar sta postavljena v različna skladišča, kar omogoča neodvisen razvoj in reÅ¡i zmedo glede Å¡tevilk gradenj." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgstr "Za nepovezane projekte boste verjetno uporabili različna skladišča. Ko objavite spremembe, se spremeni Å¡tevilka revizije celotnega skladišča, ne Å¡tevilka revizije projekta. Če imate v enem skladišču dva projekta, lahko to vodi do velikih \"lukenj\" pri Å¡tevilkah revizij. Projekta Git in TortoiseGit se nahajata na istem strežniku, vendar sta postavljena v različna skladišča, kar omogoča neodvisen razvoj in reÅ¡i zmedo glede Å¡tevilk gradenj." #. (para) #: ../source/TortoiseGit_en.xml:3231 @@ -3006,8 +3006,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3333 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "Orodje svnadmin se namesti samodejno ob namestitvi odjemalca Subversion za ukazno vrstico. Če nameščate odjemalca za ukazno vrstico na operacijskem sistemu Windows, je najbolje, da si prenesete namestitveni program. Stisnjen je bolj učinkovito kot različica .zip, tako da je prenos hitrejÅ¡i, poleg tega pa namesto vas opravi nastavitve. NajnovejÅ¡a različica odjemalca Subversion za ukazno vrstico se nahaja na naslovu http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "Orodje svnadmin se namesti samodejno ob namestitvi odjemalca Git za ukazno vrstico. Če nameščate odjemalca za ukazno vrstico na operacijskem sistemu Windows, je najbolje, da si prenesete namestitveni program. Stisnjen je bolj učinkovito kot različica .zip, tako da je prenos hitrejÅ¡i, poleg tega pa namesto vas opravi nastavitve. NajnovejÅ¡a različica odjemalca Git za ukazno vrstico se nahaja na naslovu http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:3348 @@ -3033,8 +3033,8 @@ msgstr "ukazne datoteke akcij na strežniku" #. (para) #: ../source/TortoiseGit_en.xml:3358 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." -msgstr "Ukazna datoteka akcije je program, ki ga sproži dogodek v skladišču, n. pr. nova revizija ali sprememba lastnosti brez različic. Vsaka akcija dobi dovolj informacij, da ve, za kateri dogodek gre, na katerih ciljih deluje in uporabniÅ¡ko ime osebe, ki je dogodek sprožila. Glede na rezultat akcije ali vrnjen status lahko skripta pusti, da se operacija nadaljuje, jo ustavi ali drugače prepreči njeno izvajanje. Preberite poglavje Hook Scripts v knjigi The Subversion Book, če želite izvedeti kaj več o akcijah, ki so na voljo." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." +msgstr "Ukazna datoteka akcije je program, ki ga sproži dogodek v skladišču, n. pr. nova revizija ali sprememba lastnosti brez različic. Vsaka akcija dobi dovolj informacij, da ve, za kateri dogodek gre, na katerih ciljih deluje in uporabniÅ¡ko ime osebe, ki je dogodek sprožila. Glede na rezultat akcije ali vrnjen status lahko skripta pusti, da se operacija nadaljuje, jo ustavi ali drugače prepreči njeno izvajanje. Preberite poglavje Hook Scripts v knjigi The Git Book, če želite izvedeti kaj več o akcijah, ki so na voljo." #. (para) #: ../source/TortoiseGit_en.xml:3373 @@ -3085,8 +3085,8 @@ msgstr "spletna stran" #. (para) #: ../source/TortoiseGit_en.xml:3412 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." -msgstr "Če želite ponuditi skladišče Subversion tudi ostalim uporabnikom, lahko povezavo vključite v svojo spletno stran. Da jo naredite bolj dostopno, lahko dodate prevzemno povezavo za uporabnike TortoiseGit." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgstr "Če želite ponuditi skladišče Git tudi ostalim uporabnikom, lahko povezavo vključite v svojo spletno stran. Da jo naredite bolj dostopno, lahko dodate prevzemno povezavo za uporabnike TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:3418 @@ -3134,18 +3134,18 @@ msgstr "Dnevna uporaba" #. (para) #: ../source/TortoiseGit_en.xml:3451 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." -msgstr "Ta dokument opisuje dnevno uporabo odjemalca TortoiseGit. To ni uvod v sisteme za nadzor različic, prav tako pa ni uvod v Subversion (SVN). To poglavje uporabite, ko veste, kaj želite narediti, vendar se ne spomnite natančno, kako se to naredi." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgstr "Ta dokument opisuje dnevno uporabo odjemalca TortoiseGit. To ni uvod v sisteme za nadzor različic, prav tako pa ni uvod v Git (SVN). To poglavje uporabite, ko veste, kaj želite narediti, vendar se ne spomnite natančno, kako se to naredi." #. (para) #: ../source/TortoiseGit_en.xml:3459 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." -msgstr "Če potrebujete uvod v nadzor različic s sistemom Subversion, vam priporočamo odlično knjigo: Version Control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." +msgstr "Če potrebujete uvod v nadzor različic s sistemom Git, vam priporočamo odlično knjigo: Version Control with Git." #. (para) #: ../source/TortoiseGit_en.xml:3466 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." -msgstr "Tako kot programa TortoiseGit in Subversion je tudi ta dokument \"v delu\". Če najdete kakÅ¡ne napake, jih sporočite na dopisni seznam, da bomo lahko dokumentacijo dopolnili. Nekateri posnetki zaslonov v Dnevni uporabi so lahko drugačni, kot so trenutno v aplikaciji. Prosimo, oprostite. Aplikacijo TortoiseGit razvijamo v svojem prostem času." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgstr "Tako kot programa TortoiseGit in Git je tudi ta dokument \"v delu\". Če najdete kakÅ¡ne napake, jih sporočite na dopisni seznam, da bomo lahko dokumentacijo dopolnili. Nekateri posnetki zaslonov v Dnevni uporabi so lahko drugačni, kot so trenutno v aplikaciji. Prosimo, oprostite. Aplikacijo TortoiseGit razvijamo v svojem prostem času." #. (para) #: ../source/TortoiseGit_en.xml:3478 @@ -3159,13 +3159,13 @@ msgstr "morate poznati sisteme za nadzor različic," #. (para) #: ../source/TortoiseGit_en.xml:3488 -msgid "You should know the basics of Subversion." -msgstr "morate poznati osnove sistema Subversion," +msgid "You should know the basics of Git." +msgstr "morate poznati osnove sistema Git," #. (para) #: ../source/TortoiseGit_en.xml:3493 -msgid "You should have set up a server and/or have access to a Subversion repository." -msgstr "imeti morate nameščen strežnik in/ali dostop do skladišča Subversion." +msgid "You should have set up a server and/or have access to a Git repository." +msgstr "imeti morate nameščen strežnik in/ali dostop do skladišča Git." #. (para) #: ../source/TortoiseGit_en.xml:3474 @@ -3354,12 +3354,12 @@ msgstr "svn.username vsebuje avtentikacijske podatke za avt #. (para) #: ../source/TortoiseGit_en.xml:3644 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " -msgstr "Če je skladišče, do katerega želite dostopati, zaščiteno z geslom, se prikaže avtentikacijsko pogovorno okno. VpiÅ¡ite svoje uporabniÅ¡ko ime in geslo. Potrditveno polje pove programu TortoiseGit, naj avtentikacijske podatke shrani v privzeto mapo: %APPDATA%\\Subversion\\auth v tri podmape: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " +msgstr "Če je skladišče, do katerega želite dostopati, zaščiteno z geslom, se prikaže avtentikacijsko pogovorno okno. VpiÅ¡ite svoje uporabniÅ¡ko ime in geslo. Potrditveno polje pove programu TortoiseGit, naj avtentikacijske podatke shrani v privzeto mapo: %APPDATA%\\Git\\auth v tri podmape: " #. (para) #: ../source/TortoiseGit_en.xml:3675 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." msgstr "Če želite izbrisati avtentikacijski predpomnilnik za vse strežnike, lahko to storite v nastavitvah TortoiseGit - stran SploÅ¡no. Ta gumb bo izbrisal vse avtentikacijske podatke iz map auth, prav tako pa tudi vse podatke iz registra (iz prejÅ¡njih različic TortoiseGit). Preberite ." #. (para) @@ -3435,7 +3435,7 @@ msgstr "Povsem preprosto je uvoziti v napačno mapo znotraj hierarhije skladiÅ¡ #. (para) #: ../source/TortoiseGit_en.xml:3730 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "To podpoglavje opisuje ukaz Uvozi, katerega namen je uvažanje strukture map v skladišče v eni potezi. Čeprav opravi svoje delo, pa ima nekaj pomanjkljivosti: Zato priporočamo, da tega ukaza ne uporabljate, ampak uporabite postopek v dveh korakih, opisan v . Ker pa ste že ravno tukaj, si vseeno poglejmo, kako uvažanje deluje..." #. (para) @@ -3555,7 +3555,7 @@ msgstr "Za primer si poglejte ukazno datoteko za gradnjo TortoiseGit. Ta kliče #. (para) #: ../source/TortoiseGit_en.xml:3910 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." msgstr "Da ne bi motili uporabnikov, smo dodali datoteko TortoiseVars.bat na listo prezrtih elementov v nadrejeni mapi, to pomeni, da smo nastavili lastnost svn:ignore, ki vsebuje to datoteko. Tako se ta datoteka ne bo pojavila v oknu za objave kot datoteka brez različic." #. (title) @@ -3583,17 +3583,17 @@ msgstr "Včasih je koristno izdelati delovno kopijo, ki je sestavljena iz več r #. (para) #: ../source/TortoiseGit_en.xml:3934 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" -"Denimo, da prevzamete delovno kopijo projekta /projekt1 v D:\\dev\\projekt. Izberite mapo D:\\dev\\projekt1, desno kliknite in iz kontekstnega menija izberite Windows MenuLastnosti. Pojavi se okno Lastnosti. Pojdite na zavihek Subversion. Tu lahko nastavite lastnosti. Kliknite Dodaj.... Iz spustnega seznama izberite lastnost svn:externals in vpiÅ¡ite v polje naslov URL skladišča v obliki ime url ali če želite nastaviti določeno revizijo: ime -rREV url Dodate lahko več zunanjih projektov, po enega v vrstico. UpoÅ¡tevajte, da morate uporabiti pravilne znake za naslov URL, sicer lastnosti ne bodo delovale pravilno. Na primer: vsak presledek morate zamenjati s %20. UpoÅ¡tevajte, da ne morete uporabljati map, ki vsebujejo presledke. Denimo, da ste nastavili na D:\\dev\\projekt1 naslednje lastnosti: \n" +"Denimo, da prevzamete delovno kopijo projekta /projekt1 v D:\\dev\\projekt. Izberite mapo D:\\dev\\projekt1, desno kliknite in iz kontekstnega menija izberite Windows MenuLastnosti. Pojavi se okno Lastnosti. Pojdite na zavihek Git. Tu lahko nastavite lastnosti. Kliknite Dodaj.... Iz spustnega seznama izberite lastnost svn:externals in vpiÅ¡ite v polje naslov URL skladišča v obliki ime url ali če želite nastaviti določeno revizijo: ime -rREV url Dodate lahko več zunanjih projektov, po enega v vrstico. UpoÅ¡tevajte, da morate uporabiti pravilne znake za naslov URL, sicer lastnosti ne bodo delovale pravilno. Na primer: vsak presledek morate zamenjati s %20. UpoÅ¡tevajte, da ne morete uporabljati map, ki vsebujejo presledke. Denimo, da ste nastavili na D:\\dev\\projekt1 naslednje lastnosti: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Sedaj kliknite Nastavi in objavite spremembe. Ko boste (ali pa kak drug uporabniki) posodobili delovno kopijo, bo Subversion ustvaril podmapo D:\\dev\\projekt1\\sounds in prevzel projekt Sounds, podmapo D:\\dev\\projekt1\\quick graphs s projektom Graphics in nazadnje Å¡e vgnezdeno podmapo D:\\dev\\projekt1\\skins\\toolkit z revizijo 21 projekta Skin-maker." +" Sedaj kliknite Nastavi in objavite spremembe. Ko boste (ali pa kak drug uporabniki) posodobili delovno kopijo, bo Git ustvaril podmapo D:\\dev\\projekt1\\sounds in prevzel projekt Sounds, podmapo D:\\dev\\projekt1\\quick graphs s projektom Graphics in nazadnje Å¡e vgnezdeno podmapo D:\\dev\\projekt1\\skins\\toolkit z revizijo 21 projekta Skin-maker." #. (para) #: ../source/TortoiseGit_en.xml:3974 @@ -3621,8 +3621,8 @@ msgstr "Če uporabljate absolutne naslove URL v definicijah svn:externa #. (para) #: ../source/TortoiseGit_en.xml:4010 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." -msgstr "V izogib tem težavam odjemalci Subversion verzije 1.5 ali novejÅ¡e podpirajo relativne zunanje naslove URL. Na voljo so Å¡tirje načini podajanja relativnega naslova URL. V naslednjih primerih predpostavljamo, da imamo dve skladišči: enega na naslovu http://primer.com/svn/sklad-1 in drugega na naslovu http://primer.com/svn/sklad-2. Prevzem naslova http://primer.com/svn/sklad-1/projekt/trunk naredimo v mapo C:\\Delo, lastnost svn:externals pa je nastavljena na glavno vejo (trunk)." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgstr "V izogib tem težavam odjemalci Git verzije 1.5 ali novejÅ¡e podpirajo relativne zunanje naslove URL. Na voljo so Å¡tirje načini podajanja relativnega naslova URL. V naslednjih primerih predpostavljamo, da imamo dve skladišči: enega na naslovu http://primer.com/svn/sklad-1 in drugega na naslovu http://primer.com/svn/sklad-2. Prevzem naslova http://primer.com/svn/sklad-1/projekt/trunk naredimo v mapo C:\\Delo, lastnost svn:externals pa je nastavljena na glavno vejo (trunk)." #. (term) #: ../source/TortoiseGit_en.xml:4025 @@ -3707,7 +3707,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4116 msgid "If you need more information how TortoiseGit handles Properties read ." -msgstr "Če želite izvedeti več o tem, kako Subversion obravnava lastnosti, preberite ." +msgstr "Če želite izvedeti več o tem, kako Git obravnava lastnosti, preberite ." #. (para) #: ../source/TortoiseGit_en.xml:4120 @@ -3850,8 +3850,8 @@ msgstr "Isti postopek ponovite za mapo Projekt25." #. (para) #: ../source/TortoiseGit_en.xml:4292 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." -msgstr "Pojdite na Projekt76/Podprojekt in ponovite postopek. Mapa Projekt76 nima vsebine - izjema je le mapa Podprojekt, katere vsebina je preneÅ¡ena. Subversion je ustvaril vmesne mapi brez prenaÅ¡anja vsebine." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." +msgstr "Pojdite na Projekt76/Podprojekt in ponovite postopek. Mapa Projekt76 nima vsebine - izjema je le mapa Podprojekt, katere vsebina je preneÅ¡ena. Git je ustvaril vmesne mapi brez prenaÅ¡anja vsebine." #. (title) #: ../source/TortoiseGit_en.xml:4302 @@ -3860,8 +3860,8 @@ msgstr "Globine delovne kopije ni mogoče zmanjÅ¡ati" #. (para) #: ../source/TortoiseGit_en.xml:4303 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." -msgstr "Potem ko ste prevzeli delovno kopijo do določene globine, lahko to globino povečate, da dobite dodatne vsebine. Globine pa ni mogoče zmanjÅ¡ati in s tem brisati vsebino. Ta zmožnost bo mogoče dodana v prihodnjih različicah sistema Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." +msgstr "Potem ko ste prevzeli delovno kopijo do določene globine, lahko to globino povečate, da dobite dodatne vsebine. Globine pa ni mogoče zmanjÅ¡ati in s tem brisati vsebino. Ta zmožnost bo mogoče dodana v prihodnjih različicah sistema Git." #. (title) #: ../source/TortoiseGit_en.xml:4311 @@ -4002,8 +4002,8 @@ msgstr "Stolpci v spodnjem delu okna so povsem prilagodljivi. Z desnim k #. (para) #: ../source/TortoiseGit_en.xml:4489 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." -msgstr "Če imate nastavljene privzete nastavitve in naredite objavo sprememb, se vsi zaklepi v vaÅ¡i lasti sprostijo takoj po uspeÅ¡no izvedeni objavi. Če želite zaklepe ohraniti, potrdite polje Ohrani zaklepe. Privzeto stanje tega polja je definirano v konfiguracijski datoteki sistema Subversion z možnostjo no_unlock. Za več informacij o urejanju konfiguracijske datoteke Subversion si preberite ." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." +msgstr "Če imate nastavljene privzete nastavitve in naredite objavo sprememb, se vsi zaklepi v vaÅ¡i lasti sprostijo takoj po uspeÅ¡no izvedeni objavi. Če želite zaklepe ohraniti, potrdite polje Ohrani zaklepe. Privzeto stanje tega polja je definirano v konfiguracijski datoteki sistema Git z možnostjo no_unlock. Za več informacij o urejanju konfiguracijske datoteke Git si preberite ." #. (para) #: ../source/TortoiseGit_en.xml:4500 @@ -4013,7 +4013,7 @@ msgstr "Datoteke lahko povlečete in spustite v okno za objavo od drugod pod pog #. (para) #: ../source/TortoiseGit_en.xml:4510 msgid "You can drag unversioned files which reside within a working copy into the commit dialog, and they will be SVN added automatically." -msgstr "Datoteke brez različic lahko povlečete v pogovorno okno za objavo in bodo samodejno dodane v sistem Subversion." +msgstr "Datoteke brez različic lahko povlečete v pogovorno okno za objavo in bodo samodejno dodane v sistem Git." #. (title) #. (title) @@ -4026,8 +4026,8 @@ msgstr "Popravljanje zunanjih preimenovanj" #. (para) #: ../source/TortoiseGit_en.xml:4517 #: ../source/TortoiseGit_en.xml:5318 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "Včasih datoteke preimenujete zunaj sistema Subversion, zato se v seznamu sprememb pojavita manjkajoča datoteka in datoteka brez različic. Da bi preprečili izgubo zgodovine, morate sistemu Subversion povedati, da med datotekama obstaja povezava. Enostavno izberite tako staro ime (manjkajoče) kot novo ime (brez različic) in uporabite Kontekstni meniPopravi premik in s tem povežete datoteki v preimenovanje." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "Včasih datoteke preimenujete zunaj sistema Git, zato se v seznamu sprememb pojavita manjkajoča datoteka in datoteka brez različic. Da bi preprečili izgubo zgodovine, morate sistemu Git povedati, da med datotekama obstaja povezava. Enostavno izberite tako staro ime (manjkajoče) kot novo ime (brez različic) in uporabite Kontekstni meniPopravi premik in s tem povežete datoteki v preimenovanje." #. (title) #. (title) @@ -4038,7 +4038,7 @@ msgstr "Seznami sprememb" #. (para) #: ../source/TortoiseGit_en.xml:4533 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "Okno za objave omogoča uporabo seznamov sprememb, kar pomaga pri združevanju sprememb v logične skupine. Za več informacij o tej zmožnosti preberite ." #. (title) @@ -4312,8 +4312,8 @@ msgstr "Krajevna datoteka že obstaja" #. (para) #: ../source/TortoiseGit_en.xml:4862 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." -msgstr "Včasih posodabljanje ni uspeÅ¡no in dobite obvestilo, da v delovni kopiji že obstaja datoteka z enakim imenom. To se zgodi takrat, ko želi Subversion prevzeti iz skladišča novo dodano datoteko in ugotovi, da v delovni kopiji že obstaja datoteka z enakim imenom. Subversion nikoli ne prepiÅ¡e datoteke, ki ni pod nadzorom - lahko vsebuje nekaj, na čemer delate in ima slučajno povsem enako ime, kot ga je nek drug uporabnik uporabil za novo dodano datoteko." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgstr "Včasih posodabljanje ni uspeÅ¡no in dobite obvestilo, da v delovni kopiji že obstaja datoteka z enakim imenom. To se zgodi takrat, ko želi Git prevzeti iz skladišča novo dodano datoteko in ugotovi, da v delovni kopiji že obstaja datoteka z enakim imenom. Git nikoli ne prepiÅ¡e datoteke, ki ni pod nadzorom - lahko vsebuje nekaj, na čemer delate in ima slučajno povsem enako ime, kot ga je nek drug uporabnik uporabil za novo dodano datoteko." #. (para) #: ../source/TortoiseGit_en.xml:4871 @@ -4362,27 +4362,27 @@ msgstr "imedatoteke.kon.rNOVAREVIZIJA" #. (para) #: ../source/TortoiseGit_en.xml:4941 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." -msgstr "To je datoteka, ki jo je odjemalec Subversion pri posodabljanju delovne kopije prejel od strežnika. Ta datoteka ustreza reviziji HEAD v skladišču." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgstr "To je datoteka, ki jo je odjemalec Git pri posodabljanju delovne kopije prejel od strežnika. Ta datoteka ustreza reviziji HEAD v skladišču." #. (para) #: ../source/TortoiseGit_en.xml:4896 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" -"Občasno se pri posodabljanju delovne kopije iz skladišča pojavijo spori. Spor se pojavi, ko več uporabnikov spremeni iste vrstice v datoteki. Ker Subversion o vaÅ¡em projektu ne ve nič, prepusti reÅ¡evanje sporov uporabnikom. Ko dobite sporočilo o sporu, morate sporno datoteko odpreti in poiskati vrstice, ki imajo na začetku niz <<<<<<<. Sporno območje je označeno takole: \n" +"Občasno se pri posodabljanju delovne kopije iz skladišča pojavijo spori. Spor se pojavi, ko več uporabnikov spremeni iste vrstice v datoteki. Ker Git o vaÅ¡em projektu ne ve nič, prepusti reÅ¡evanje sporov uporabnikom. Ko dobite sporočilo o sporu, morate sporno datoteko odpreti in poiskati vrstice, ki imajo na začetku niz <<<<<<<. Sporno območje je označeno takole: \n" "<<<<<<< ime datoteke\n" " vaÅ¡e spremembe\n" "=======\n" " koda, spojena iz skladišča\n" ">>>>>>> revizija\n" -" Poleg tega Subversion za vsako sporno datoteko doda v mapo tri dodatne datoteke: " +" Poleg tega Git za vsako sporno datoteko doda v mapo tri dodatne datoteke: " #. (para) #: ../source/TortoiseGit_en.xml:4951 @@ -4396,8 +4396,8 @@ msgstr "Nato uporabite ukaz TortoiseGitfilename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." -msgstr "Če se pojavijo spori pri dvojiÅ¡kih datotekah, Subversion ne poskuÅ¡a sam spajati datotek. Krajevna datoteka ostane nespremenjena (natančno takÅ¡na kot ob vaÅ¡i zadnji spremembi), pojavijo pa se datoteke imedatoteke.kon.r*. Če želite preklicati svoje spremembe in uporabiti različico datoteke iz skladišča, uporabite ukaz Povrni. Če želite obdržati vaÅ¡o različico in povoziti različico v skladišču, uporabite ukaz ReÅ¡en, nato pa objavite spremembe." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgstr "Če se pojavijo spori pri dvojiÅ¡kih datotekah, Git ne poskuÅ¡a sam spajati datotek. Krajevna datoteka ostane nespremenjena (natančno takÅ¡na kot ob vaÅ¡i zadnji spremembi), pojavijo pa se datoteke imedatoteke.kon.r*. Če želite preklicati svoje spremembe in uporabiti različico datoteke iz skladišča, uporabite ukaz Povrni. Če želite obdržati vaÅ¡o različico in povoziti različico v skladišču, uporabite ukaz ReÅ¡en, nato pa objavite spremembe." #. (para) #: ../source/TortoiseGit_en.xml:4985 @@ -4445,13 +4445,13 @@ msgstr "ikone" #. (para) #: ../source/TortoiseGit_en.xml:5027 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "Ko prevzamete delovno kopijo iz skladišča Subversion, imajo datoteke v Raziskovalcu spremenjene ikone. To je razlog za veliko popularnost programa TortoiseGit. TortoiseGit doda datotekam prekrivno ikono, ki se prekriva z originalno ikono. Prekrivna ikona je odvisna od statusa datoteke." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." +msgstr "Ko prevzamete delovno kopijo iz skladišča Git, imajo datoteke v Raziskovalcu spremenjene ikone. To je razlog za veliko popularnost programa TortoiseGit. TortoiseGit doda datotekam prekrivno ikono, ki se prekriva z originalno ikono. Prekrivna ikona je odvisna od statusa datoteke." #. (para) #: ../source/TortoiseGit_en.xml:5035 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " Sveže prevzeta delovna kopija ima zeleno prekrivno ikono. To pomeni, da je status datoteke/mape običajno." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " Sveže prevzeta delovna kopija ima zeleno prekrivno ikono. To pomeni, da je status datoteke/mape običajno." #. (para) #: ../source/TortoiseGit_en.xml:5040 @@ -4465,12 +4465,12 @@ msgstr " Če se pri posodabljan #. (para) #: ../source/TortoiseGit_en.xml:5053 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." -msgstr " Če ste datoteki nastavili lastnost svn:needs-lock, Subversion napravi to datoteko samo za branje, dokler za datoteko ne pridobite zaklepa. Datoteke, ki so namenjene samo za branje, imajo takÅ¡no ikono, da lahko hitro vidite, da morate pred urejanjem datoteke zanjo pridobiti zaklep." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgstr " Če ste datoteki nastavili lastnost svn:needs-lock, Git napravi to datoteko samo za branje, dokler za datoteko ne pridobite zaklepa. Datoteke, ki so namenjene samo za branje, imajo takÅ¡no ikono, da lahko hitro vidite, da morate pred urejanjem datoteke zanjo pridobiti zaklep." #. (para) #: ../source/TortoiseGit_en.xml:5060 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." msgstr " Če ste lastnik zaklepa datoteke, ki ima stanje običajno, vas ta ikona opominja, da morate zaklep sprostiti, če ga ne uporabljate, da lahko tudi drugi uporabniki objavijo spremembe na tej datoteki." #. (para) @@ -4505,8 +4505,8 @@ msgstr "Na trgu je več odjemalcev tipa Tortoise (TortoiseCVS, TortoiseHG, ...), #. (para) #: ../source/TortoiseGit_en.xml:5105 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." -msgstr "Za opis, kakÅ¡nemu statusu v sistemu Subversion ustrezajo prekrivne ikone in ostale tehnične podrobnosti preberite ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." +msgstr "Za opis, kakÅ¡nemu statusu v sistemu Git ustrezajo prekrivne ikone in ostale tehnične podrobnosti preberite ." #. (title) #: ../source/TortoiseGit_en.xml:5112 @@ -4942,8 +4942,8 @@ msgstr "Prekopirate podrobnosti dnevnika izbranih revizij na odložišče. S tem #. (para) #: ../source/TortoiseGit_en.xml:5723 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." -msgstr "Iščete po sporočilih dnevniÅ¡kih zapisov. Iskanje poteka po dnevniÅ¡kih zapisih, ki jih vnesete, in po povzetkih akcij, ki jih ustvari Subversion in so prikazani v spodnjem delu okna. Iskanje ni občutljivo na velike in male črke." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." +msgstr "Iščete po sporočilih dnevniÅ¡kih zapisov. Iskanje poteka po dnevniÅ¡kih zapisih, ki jih vnesete, in po povzetkih akcij, ki jih ustvari Git in so prikazani v spodnjem delu okna. Iskanje ni občutljivo na velike in male črke." #. (para) #: ../source/TortoiseGit_en.xml:5562 @@ -5029,8 +5029,8 @@ msgstr "Povrnte spremembe, narejene na izbrani datoteki izbrane revizije." #. (para) #: ../source/TortoiseGit_en.xml:5824 -msgid "View the Subversion properties for the selected item." -msgstr "Pogledate lastnosti Subversion za izbran element." +msgid "View the Git properties for the selected item." +msgstr "Pogledate lastnosti Git za izbran element." #. (para) #: ../source/TortoiseGit_en.xml:5829 @@ -5054,17 +5054,17 @@ msgstr "Mogoče ste opazili, da uporabljamo izraza razlike in spremembe. KakÅ¡na #. (para) #: ../source/TortoiseGit_en.xml:5846 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." -msgstr "Å tevilke revizij v sistemu Subversion pomenijo dve stvari. Revizija predstavlja stanje skladišča v nekem trenutku, predstavlja pa tudi seznam sprememb, ki so ustvarile to revizijo. N. pr. Narejeno v r1234 pomeni, da spremembe, narejene v reviziji 1234, ustvarijo funkcionalnost X. Da ponazorimo, kateri pomen imamo v mislih, uporabljamo dva izraza." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgstr "Å tevilke revizij v sistemu Git pomenijo dve stvari. Revizija predstavlja stanje skladišča v nekem trenutku, predstavlja pa tudi seznam sprememb, ki so ustvarile to revizijo. N. pr. Narejeno v r1234 pomeni, da spremembe, narejene v reviziji 1234, ustvarijo funkcionalnost X. Da ponazorimo, kateri pomen imamo v mislih, uporabljamo dva izraza." #. (para) #: ../source/TortoiseGit_en.xml:5855 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." msgstr "Če izberete revizijo N in M, vam kontekstni meni ponuja možnost prikaza razlik med tema dvema revizijama. Ekvivalenten ukaz pri delu z odjemalcem za ukazno vrstivo je diff -r M:N." #. (para) #: ../source/TortoiseGit_en.xml:5861 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "Če izberete samo revizijo N, vam kontekstni meni ponuja prikaz sprememb, opravljenih v tej reviziji. Ekvivalentna ukaza pri uporabi odjemalca za ukazno vrstico sta diff -r N-1:N in diff -c N." #. (para) @@ -5099,8 +5099,8 @@ msgstr "Kadar je okno Prikaži dnevnik prikazano iz okna za spajanje, je to polj #. (para) #: ../source/TortoiseGit_en.xml:5916 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." -msgstr "UpoÅ¡tevajte, da Subversion izvaja preimenovanje s parom kopirane in izbrisane datoteke, zato bo preimenovanje datoteke ali mape povzročilo, da se v tem primeru dnevniÅ¡ki zapis ustavi, če je ta možnost vklopljena." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgstr "UpoÅ¡tevajte, da Git izvaja preimenovanje s parom kopirane in izbrisane datoteke, zato bo preimenovanje datoteke ali mape povzročilo, da se v tem primeru dnevniÅ¡ki zapis ustavi, če je ta možnost vklopljena." #. (para) #: ../source/TortoiseGit_en.xml:5875 @@ -5139,8 +5139,8 @@ msgstr "zapis sledenja spajanja" #. (para) #: ../source/TortoiseGit_en.xml:5950 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." -msgstr "Subversion 1.5 uvaja sledenje spajanja z uporabo lastnosti. To nam omogoča pridobiti podrobnejÅ¡o zgodovino spojenih sprememb. Primer: če na posebni veji razvijate neko novo zmožnost programa in potem spremembe spojite na glavno vejo, boste na glavni veji to novo zmožnost videli kot eno objavo, čeprav ste pri razvoju te lastnosti na posebni veji naredili tisoč objav." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgstr "Git 1.5 uvaja sledenje spajanja z uporabo lastnosti. To nam omogoča pridobiti podrobnejÅ¡o zgodovino spojenih sprememb. Primer: če na posebni veji razvijate neko novo zmožnost programa in potem spremembe spojite na glavno vejo, boste na glavni veji to novo zmožnost videli kot eno objavo, čeprav ste pri razvoju te lastnosti na posebni veji naredili tisoč objav." #. (title) #: ../source/TortoiseGit_en.xml:5959 @@ -5174,8 +5174,8 @@ msgstr "Včasih želite spremeniti vneÅ¡eno sporočilo dnevniÅ¡kega zapisa - zar #. (para) #: ../source/TortoiseGit_en.xml:5991 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." -msgstr "Subversion vam omogoča kadarkoli po objavi spremeniti tako sporočilo dnevniÅ¡kega zapisa kot tudi avtorja objave. Ker pa se teh sprememb ne na povrniti (niso pod nadzorom različic), s privzetimi nastavitvami ta možnost ni vključena. Nastaviti morate ukazno datoteko akcije pre-revprop-change. Poglejte v poglavje Hook Scripts v knjiigi The Subversion Book, če želite izvedeti več o tem. Preberite , če želite informacije o nastavljanju ukaznih datotek akcij v operacijskem sistemu Windows." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgstr "Git vam omogoča kadarkoli po objavi spremeniti tako sporočilo dnevniÅ¡kega zapisa kot tudi avtorja objave. Ker pa se teh sprememb ne na povrniti (niso pod nadzorom različic), s privzetimi nastavitvami ta možnost ni vključena. Nastaviti morate ukazno datoteko akcije pre-revprop-change. Poglejte v poglavje Hook Scripts v knjiigi The Git Book, če želite izvedeti več o tem. Preberite , če želite informacije o nastavljanju ukaznih datotek akcij v operacijskem sistemu Windows." #. (para) #: ../source/TortoiseGit_en.xml:6004 @@ -5184,8 +5184,8 @@ msgstr "Ko ste na strežniku nastavili zahtevane akcije, lahko spremenite tako a #. (para) #: ../source/TortoiseGit_en.xml:6010 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." -msgstr "Lastnosti revizij v sistemu Subversion so brez različic, zato bo sprememba lastnosti (n. pr. lastnost svn:log za sporočilo objave) za vedno prepisala predhodno vrednosti te lastnosti." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgstr "Lastnosti revizij v sistemu Git so brez različic, zato bo sprememba lastnosti (n. pr. lastnost svn:log za sporočilo objave) za vedno prepisala predhodno vrednosti te lastnosti." #. (title) #: ../source/TortoiseGit_en.xml:6020 @@ -5438,8 +5438,8 @@ msgstr "Razlika med datoteko/mapo v delovni kopiji in na naslovu URL" #. (para) #: ../source/TortoiseGit_en.xml:6323 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." -msgstr "Če želite videti razlike med datoteko v delovni kopiji in datoteko v skladišču Subversion, lahko to storite neposredno iz Raziskovalca. Izberite datoteko, pritisnite tipko Shift in desno kliknite, da se pojavi kontekstni meni. Izberite TortoiseGitRazlikuj z URL. Enako lahko storite na delovni kopiji. TortoiseMerge prikaže razlike enako kot pri prikazu datoteke popravkov - seznam spremenjenih datotek, ki jih lahko pregledujete eno za drugo." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgstr "Če želite videti razlike med datoteko v delovni kopiji in datoteko v skladišču Git, lahko to storite neposredno iz Raziskovalca. Izberite datoteko, pritisnite tipko Shift in desno kliknite, da se pojavi kontekstni meni. Izberite TortoiseGitRazlikuj z URL. Enako lahko storite na delovni kopiji. TortoiseMerge prikaže razlike enako kot pri prikazu datoteke popravkov - seznam spremenjenih datotek, ki jih lahko pregledujete eno za drugo." #. (term) #: ../source/TortoiseGit_en.xml:6341 @@ -5833,8 +5833,8 @@ msgstr "oznaka" #. (para) #: ../source/TortoiseGit_en.xml:6767 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." -msgstr "Pogosto se zgodi, da nekatere datoteke že imate v skladišču v okviru drugega projekta in jih želite prekopirati. Lahko jih preprosto prekopirate in dodate v nadzor različic, kot je opisano v prejÅ¡njem razdelku, vendar v tem primeru izgubite zgodovino datoteke. Če kasneje odkrijete in popravite napako v originalnih datotekah, lahko spremembe samodejno spojite le, če med originalnimi in novimi datotekami obstaja povezava v sistemu Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." +msgstr "Pogosto se zgodi, da nekatere datoteke že imate v skladišču v okviru drugega projekta in jih želite prekopirati. Lahko jih preprosto prekopirate in dodate v nadzor različic, kot je opisano v prejÅ¡njem razdelku, vendar v tem primeru izgubite zgodovino datoteke. Če kasneje odkrijete in popravite napako v originalnih datotekah, lahko spremembe samodejno spojite le, če med originalnimi in novimi datotekami obstaja povezava v sistemu Git." #. (para) #: ../source/TortoiseGit_en.xml:6775 @@ -5913,8 +5913,8 @@ msgstr "SploÅ¡ni seznam prezrtih elementov" #. (para) #: ../source/TortoiseGit_en.xml:6887 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." -msgstr "Drug način, kako prezreti datoteke, je dodajanje na sploÅ¡ni seznam prezrtih elementov. Razlika je v tem, da je sploÅ¡en seznam lastnost odjemalca. Velja za vse projekte v sistemu Subversion, vendar le na računalniku, kjer je nameščen odjemalec. Kjer je to le mogoče, je v sploÅ¡nem bolje uporabiti lastnost svn:ignore, ker jo lahko nastavimo na določene dele projekta, poleg tega pa velja za vse uporabnike, ki prevzamejo projekt. Za več informacij preberite ." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgstr "Drug način, kako prezreti datoteke, je dodajanje na sploÅ¡ni seznam prezrtih elementov. Razlika je v tem, da je sploÅ¡en seznam lastnost odjemalca. Velja za vse projekte v sistemu Git, vendar le na računalniku, kjer je nameščen odjemalec. Kjer je to le mogoče, je v sploÅ¡nem bolje uporabiti lastnost svn:ignore, ker jo lahko nastavimo na določene dele projekta, poleg tega pa velja za vse uporabnike, ki prevzamejo projekt. Za več informacij preberite ." #. (title) #: ../source/TortoiseGit_en.xml:6900 @@ -5923,7 +5923,7 @@ msgstr "Dodajanje elementov pod nadzorom različic na seznam prezrtih" #. (para) #: ../source/TortoiseGit_en.xml:6901 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "Datotek in map pod nadzorom različic ni mogoče prezreti. Če ste dali datoteko pod nadzor različic po pomoti, preberite , kjer je opisano, kako jo iz sistema nadzora odstranite." #. (title) @@ -5973,13 +5973,13 @@ msgstr "Poišče katerikoli znak, ki je podan v oglatem oklepaju. Par znakov zno #. (para) #: ../source/TortoiseGit_en.xml:6916 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " -msgstr "Iskanje vzorcev v sistemu Subversion uporablja tehniko, ki izvira iz sistema Unix in se uporablja za določanje datotek z uporabo meta-znakov. Naslednji znaki imajo poseben pomen: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgstr "Iskanje vzorcev v sistemu Git uporablja tehniko, ki izvira iz sistema Unix in se uporablja za določanje datotek z uporabo meta-znakov. Naslednji znaki imajo poseben pomen: " #. (para) #: ../source/TortoiseGit_en.xml:6956 -msgid "Subversion uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." -msgstr "Subversion v vseh notranjih imenih poti uporablja znak / za ločevanje poti, zato se ta oblika zapisa uporablja tudi pri iskanju vzorcev. Če želite v svojih vzorcih uporabiti znak za ločevanje poti, morate uporabiti / in ne \\, ki se uporablja v sistemu Windows." +msgid "Git uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." +msgstr "Git v vseh notranjih imenih poti uporablja znak / za ločevanje poti, zato se ta oblika zapisa uporablja tudi pri iskanju vzorcev. Če želite v svojih vzorcih uporabiti znak za ločevanje poti, morate uporabiti / in ne \\, ki se uporablja v sistemu Windows." #. (para) #: ../source/TortoiseGit_en.xml:6962 @@ -5988,12 +5988,12 @@ msgstr "Iskanje vzorcev je občutljivo na velike in male črke, kar lahko v sist #. (para) #: ../source/TortoiseGit_en.xml:6969 -msgid "Subversion uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." -msgstr "Subversion uporablja iskanje vzorcev za vse poti, ki jih uporabimo pri ukazih. Te poti so v sploÅ¡nem relativne na mapo, na kateri ukaz deluje (n. pr. pri uvažanju, dodajanju, objavi). Iskanje vzorcev mora zato upoÅ¡tevati, da je pred imenom datoteke lahko naveden del poti." +msgid "Git uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." +msgstr "Git uporablja iskanje vzorcev za vse poti, ki jih uporabimo pri ukazih. Te poti so v sploÅ¡nem relativne na mapo, na kateri ukaz deluje (n. pr. pri uvažanju, dodajanju, objavi). Iskanje vzorcev mora zato upoÅ¡tevati, da je pred imenom datoteke lahko naveden del poti." #. (para) #: ../source/TortoiseGit_en.xml:6976 -msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Subversion compares them with the ignore pattern." +msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Git compares them with the ignore pattern." msgstr "Če je v imenu datoteke navedena tudi pot, je algoritem za iskanje vzorcev ne bo odrezal. Vzorec Fred.* bo naÅ¡el niz Fred.c, ne pa tudi niza subdir/Fred.c. To je pomembno, če želite dodati mapo, ki vsebuje določene datoteke, ki jih želite prezreti. Te datoteke bodo namreč navedene z delom poti pred imenom in takÅ¡en niz se bo uporabil pri iskanju vzorcev." #. (para) @@ -6023,8 +6023,8 @@ msgstr "Konteksni meni v Raziskovalcu za datotek pod nadzorom različic" #. (para) #: ../source/TortoiseGit_en.xml:7011 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " -msgstr "V nasprotju s sistemom CVS Subversion dovoljuje preimenovanje in premikanje datotek in map. Zato se v podmeniju TortoiseGit nahajajo ukazi za brisanje in preimenovanje. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgstr "V nasprotju s sistemom CVS Git dovoljuje preimenovanje in premikanje datotek in map. Zato se v podmeniju TortoiseGit nahajajo ukazi za brisanje in preimenovanje. " #. (title) #: ../source/TortoiseGit_en.xml:7021 @@ -6043,8 +6043,8 @@ msgstr "odstrani" #. (para) #: ../source/TortoiseGit_en.xml:7028 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." -msgstr "Za brisanje datotek ali map iz sistema Subversion uporabite TortoiseGitIzbriÅ¡i." +msgid "Use TortoiseGitDelete to remove files or folders from Git." +msgstr "Za brisanje datotek ali map iz sistema Git uporabite TortoiseGitIzbriÅ¡i." #. (para) #: ../source/TortoiseGit_en.xml:7036 @@ -6053,8 +6053,8 @@ msgstr "Ko uporabite ukaz TortoiseGitTortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." -msgstr "Ko uporabite ukaz TortoiseGitIzbriÅ¡i na mapi, ta ostane v delovni kopiji, njena ikona pa se spremeni in nakazuje, da je mapa označena za brisanje. Dokler sprememb ne objavite, lahko mapo pridobite nazaj z uporabo ukaza TortoiseGitPovrni na mapi sami. Vzrok za razliko pri obnaÅ¡anju je v delovnaju sistema Subversion, ne sistema TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." +msgstr "Ko uporabite ukaz TortoiseGitIzbriÅ¡i na mapi, ta ostane v delovni kopiji, njena ikona pa se spremeni in nakazuje, da je mapa označena za brisanje. Dokler sprememb ne objavite, lahko mapo pridobite nazaj z uporabo ukaza TortoiseGitPovrni na mapi sami. Vzrok za razliko pri obnaÅ¡anju je v delovnaju sistema Git, ne sistema TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:7069 @@ -6063,13 +6063,13 @@ msgstr "Če želite izbrisati element iz skladišča, vendar ga želite obdržat #. (para) #: ../source/TortoiseGit_en.xml:7080 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." -msgstr "Če datoteko izbriÅ¡ete iz Raziskovalca, namesto da bi uporabili ukaz iz kontekstnega menija TortoiseGit, vam okno za objave to datoteko prikaže in vam omogoča, da jo pred objavo odstranite tudi iz sistema različic. Če pa delovno kopijo posodobite, bo Subversion manjkajočo krajevno datoteko nadomestil z zadnjo različico te datoteke v skladišču. Če želite izbrisati datoteko pod nadzorom različic, vedno uporabite ukaz TortoiseGitIzbriÅ¡i, da sistemu Subversion ne bo potrebno ugibati, kaj pravzaprav želite." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." +msgstr "Če datoteko izbriÅ¡ete iz Raziskovalca, namesto da bi uporabili ukaz iz kontekstnega menija TortoiseGit, vam okno za objave to datoteko prikaže in vam omogoča, da jo pred objavo odstranite tudi iz sistema različic. Če pa delovno kopijo posodobite, bo Git manjkajočo krajevno datoteko nadomestil z zadnjo različico te datoteke v skladišču. Če želite izbrisati datoteko pod nadzorom različic, vedno uporabite ukaz TortoiseGitIzbriÅ¡i, da sistemu Git ne bo potrebno ugibati, kaj pravzaprav želite." #. (para) #: ../source/TortoiseGit_en.xml:7094 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." -msgstr "Če mapo izbriÅ¡ete iz Raziskovalca, namesto da bi uporabili ukaz iz kontekstnega menija TortoiseGit, bo vaÅ¡a delovna kopija pokvarjena in sprememb ne boste mogli objavljati. Če delovno kopijo posodobite, bo Subversion manjkajočo mapo nadomestil z najnovejÅ¡o različico mape iz skladišča. Potem jo lahko izbriÅ¡ete na pravilen način z ukazom TortoiseGitIzbriÅ¡i." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgstr "Če mapo izbriÅ¡ete iz Raziskovalca, namesto da bi uporabili ukaz iz kontekstnega menija TortoiseGit, bo vaÅ¡a delovna kopija pokvarjena in sprememb ne boste mogli objavljati. Če delovno kopijo posodobite, bo Git manjkajočo mapo nadomestil z najnovejÅ¡o različico mape iz skladišča. Potem jo lahko izbriÅ¡ete na pravilen način z ukazom TortoiseGitIzbriÅ¡i." #. (title) #: ../source/TortoiseGit_en.xml:7107 @@ -6143,7 +6143,7 @@ msgstr "Za premikanje elementov lahko uporabite tudi brskalnik po skladišču. #. (title) #: ../source/TortoiseGit_en.xml:7202 msgid "Do Not SVN Move Externals" -msgstr "Zunanjih elementov ne premikajte z ukazi Subversion" +msgstr "Zunanjih elementov ne premikajte z ukazi Git" #. (para) #: ../source/TortoiseGit_en.xml:7203 @@ -6162,13 +6162,13 @@ msgstr "spremembe velikih in malih črk" #. (para) #: ../source/TortoiseGit_en.xml:7223 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "Spreminjanje imena, ki se od starega razlikuje le v velikih in malih črkah, je na sistemu Windows malce nerodno. Med preimenovanjem morata namreč za kratek čas obstajati obe datoteki. Ker pa datotečni sistema operacijskega sistema Windows ne loči med velikimi in malimi črkami, ukaza Preimenuj ne morete uporabiti." #. (para) #: ../source/TortoiseGit_en.xml:7229 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" -msgstr "Na srečo obstajata (vsaj) dve možni reÅ¡itvi, kako preimenovati datoteko brez izgube zgodovine. Pomembno je, da jo preimenujete v sistemu Subversion. Preimenovanje v Raziskovalcu pokvari delovno kopijo!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" +msgstr "Na srečo obstajata (vsaj) dve možni reÅ¡itvi, kako preimenovati datoteko brez izgube zgodovine. Pomembno je, da jo preimenujete v sistemu Git. Preimenovanje v Raziskovalcu pokvari delovno kopijo!" #. (para) #: ../source/TortoiseGit_en.xml:7239 @@ -6219,8 +6219,8 @@ msgstr "Obravnava težav pri imenih datotek zaradi velikih in malih črk" #. (para) #: ../source/TortoiseGit_en.xml:7285 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." -msgstr "Če se v skladišču že nahajata dve datoteki, ki se razlikujeta samo v velikih in malih črkah (n. pr. TEST.TXT in test.txt), mape, kjer se ti dve datoteki nahajata, na sistemu Windows ne morete posodobiti ali prevzeti. Subversion namreč omogoča ločevanje imen, ki se razlikujejo samo v velikih in malih črkah, sistem Windows pa ne." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." +msgstr "Če se v skladišču že nahajata dve datoteki, ki se razlikujeta samo v velikih in malih črkah (n. pr. TEST.TXT in test.txt), mape, kjer se ti dve datoteki nahajata, na sistemu Windows ne morete posodobiti ali prevzeti. Git namreč omogoča ločevanje imen, ki se razlikujejo samo v velikih in malih črkah, sistem Windows pa ne." #. (para) #: ../source/TortoiseGit_en.xml:7293 @@ -6249,13 +6249,13 @@ msgstr "Popravljanje preimenovanj datotek" #. (para) #: ../source/TortoiseGit_en.xml:7317 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." -msgstr "Včasih vaÅ¡e prijazno razvojno orodje preimenuje datoteke kot del refaktoriranja in seveda tega ne pove sistemu Subversion. Če poskusite takÅ¡ne spremembe objaviti, vidite staro datoteko kot manjkajočo in novo kot datoteko brez različic. Lahko bi enostavno dodali datoteko brez različic, vendar bi v tem primeru izgubili zgodovino, saj Subversion ne ve, da sta datoteki povezani." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." +msgstr "Včasih vaÅ¡e prijazno razvojno orodje preimenuje datoteke kot del refaktoriranja in seveda tega ne pove sistemu Git. Če poskusite takÅ¡ne spremembe objaviti, vidite staro datoteko kot manjkajočo in novo kot datoteko brez različic. Lahko bi enostavno dodali datoteko brez različic, vendar bi v tem primeru izgubili zgodovino, saj Git ne ve, da sta datoteki povezani." #. (para) #: ../source/TortoiseGit_en.xml:7325 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "BoljÅ¡i način je, da sistemu Subversion poveste, da gre v tem primeru dejansko za preimenovanje datoteke in sicer lahko to storite v oknih Objavi in Preveri posodobitve. Enostavno izberite tako staro datoteko (manjkajočo) kot novo (brez različic) in uporabite Kontekstni meniPopravi premik. S tem datoteki povežete v preimenovanje." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "BoljÅ¡i način je, da sistemu Git poveste, da gre v tem primeru dejansko za preimenovanje datoteke in sicer lahko to storite v oknih Objavi in Preveri posodobitve. Enostavno izberite tako staro datoteko (manjkajočo) kot novo (brez različic) in uporabite Kontekstni meniPopravi premik. S tem datoteki povežete v preimenovanje." #. (title) #: ../source/TortoiseGit_en.xml:7339 @@ -6264,8 +6264,8 @@ msgstr "Brisanje datotek brez različic" #. (para) #: ../source/TortoiseGit_en.xml:7340 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." -msgstr "Običajno nastavite sezname prezrtih elementov v sistemu v Subversion tako, da se prezrejo vse generirane datoteke. Kaj pa, če želite počistiti vse prezrte datoteke, da bi naredili čisto gradnjo? Običajno naredite to v skripti makefile, če pa to skripto razhroščujete ali delate spremembe v sistemu gradnje, je koristno, če lahko delovno kopijo počistite." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgstr "Običajno nastavite sezname prezrtih elementov v sistemu v Git tako, da se prezrejo vse generirane datoteke. Kaj pa, če želite počistiti vse prezrte datoteke, da bi naredili čisto gradnjo? Običajno naredite to v skripti makefile, če pa to skripto razhroščujete ali delate spremembe v sistemu gradnje, je koristno, če lahko delovno kopijo počistite." #. (para) #: ../source/TortoiseGit_en.xml:7347 @@ -6359,13 +6359,13 @@ msgstr "počisti" #. (para) #: ../source/TortoiseGit_en.xml:7442 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." -msgstr "Če se nek ukaz sistema Subversion ne more izvesti uspeÅ¡no, denimo zaradi težav s strežnikom, lahko vaÅ¡a delovna kopija ostane v nekonsistentnem stanju. V tem primeru morate na mapi uporabiti ukaz TortoiseGitPočisti. Najbolje, da to storite na vrhnji mapi delovne kopije." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgstr "Če se nek ukaz sistema Git ne more izvesti uspeÅ¡no, denimo zaradi težav s strežnikom, lahko vaÅ¡a delovna kopija ostane v nekonsistentnem stanju. V tem primeru morate na mapi uporabiti ukaz TortoiseGitPočisti. Najbolje, da to storite na vrhnji mapi delovne kopije." #. (para) #: ../source/TortoiseGit_en.xml:7453 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." -msgstr "Čiščenje ima Å¡e en uporaben stranski učinek. Če se datum datoteke spremeni, njena vsebina pa ne, lahko Subversion ugotovi, ali gre za dejansko spremembo vsebine le s popolno primerjavo trenutne datoteke z začetno datoteko. Če imate v delovni kopiji veliko datotek s spremenjenim datumom, lahko pridobivanje dejanskega stanja datotek poteka zelo dolgo, kar upočasni odzivnost pogovornih oken. Če na delovni kopiji izvedete ukaz Počisti, bo le-ta popravil datoteke z nepravilnim časovnim žigom in s tem povečal hitrost pridobivanja stanja datotek." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgstr "Čiščenje ima Å¡e en uporaben stranski učinek. Če se datum datoteke spremeni, njena vsebina pa ne, lahko Git ugotovi, ali gre za dejansko spremembo vsebine le s popolno primerjavo trenutne datoteke z začetno datoteko. Če imate v delovni kopiji veliko datotek s spremenjenim datumom, lahko pridobivanje dejanskega stanja datotek poteka zelo dolgo, kar upočasni odzivnost pogovornih oken. Če na delovni kopiji izvedete ukaz Počisti, bo le-ta popravil datoteke z nepravilnim časovnim žigom in s tem povečal hitrost pridobivanja stanja datotek." #. (title) #: ../source/TortoiseGit_en.xml:7464 @@ -6374,8 +6374,8 @@ msgstr "Uporabi časovni žig objave" #. (para) #: ../source/TortoiseGit_en.xml:7465 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." -msgstr "Nekatere starejÅ¡e različice sistema Subversion so vsebovale napako, ki je povzročila nepravilne časovne žige datotek v primeru uporabe možnosti Uporabi časovni žig objave. Uporabite ukaz Počisti, da pohitrite odzivnost takÅ¡ne delovne kopije." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgstr "Nekatere starejÅ¡e različice sistema Git so vsebovale napako, ki je povzročila nepravilne časovne žige datotek v primeru uporabe možnosti Uporabi časovni žig objave. Uporabite ukaz Počisti, da pohitrite odzivnost takÅ¡ne delovne kopije." #. (title) #: ../source/TortoiseGit_en.xml:7475 @@ -6389,38 +6389,38 @@ msgstr "lastnosti" #. (title) #: ../source/TortoiseGit_en.xml:7481 -msgid "Explorer property page, Subversion tab" -msgstr "Stran Lastnosti v Raziskovalcu, zavihek Subversion" +msgid "Explorer property page, Git tab" +msgstr "Stran Lastnosti v Raziskovalcu, zavihek Git" #. (para) #: ../source/TortoiseGit_en.xml:7479 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." -msgstr " Včasih hočete o datoteki/mapi izvedeti več, kot pove prekrivna ikona. Vse informacije, ki jih Subversion poda, lahko najdete v oknu Lastnosti. V Raziskovalcu izberite datoteko in v kontekstnem meniju izberite Meni WindowsLastnosti (pazite: to je običajno okno Lastnosti, ki ga prikaže Raziskovalec, ne tisti v podmeniju TortoiseGit!). V to okno za datoteke/mape pod nadzorom različic TortoiseGit doda zavihek Subversion, kjer dobite vse potrebne informacije o izbrani datoteki/mapi." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." +msgstr " Včasih hočete o datoteki/mapi izvedeti več, kot pove prekrivna ikona. Vse informacije, ki jih Git poda, lahko najdete v oknu Lastnosti. V Raziskovalcu izberite datoteko in v kontekstnem meniju izberite Meni WindowsLastnosti (pazite: to je običajno okno Lastnosti, ki ga prikaže Raziskovalec, ne tisti v podmeniju TortoiseGit!). V to okno za datoteke/mape pod nadzorom različic TortoiseGit doda zavihek Git, kjer dobite vse potrebne informacije o izbrani datoteki/mapi." #. (title) #: ../source/TortoiseGit_en.xml:7501 -msgid "Subversion Properties" -msgstr "Lastnosti Subversion" +msgid "Git Properties" +msgstr "Lastnosti Git" #. (primary) #: ../source/TortoiseGit_en.xml:7503 -msgid "Subversion properties" -msgstr "lastnosti Subversion" +msgid "Git properties" +msgstr "lastnosti Git" #. (title) #: ../source/TortoiseGit_en.xml:7509 -msgid "Subversion property page" -msgstr "Lastnosti v sistemu Subversion" +msgid "Git property page" +msgstr "Lastnosti v sistemu Git" #. (para) #: ../source/TortoiseGit_en.xml:7507 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." -msgstr " Lastnosti Subversion lahko preberete in nastavite v oknu Lastnosti, ki ga prikaže sistem Windows. Poleg tega vidite te lastnosti tudi, če uporabite ukaz TortoiseGitLastnosti. V pogovornih oknih TortoiseGit, kjer se izpiÅ¡ejo seznami datotek, lahko lastnosti prikažete z ukazom Kontekstni meniLastnosti." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgstr " Lastnosti Git lahko preberete in nastavite v oknu Lastnosti, ki ga prikaže sistem Windows. Poleg tega vidite te lastnosti tudi, če uporabite ukaz TortoiseGitLastnosti. V pogovornih oknih TortoiseGit, kjer se izpiÅ¡ejo seznami datotek, lahko lastnosti prikažete z ukazom Kontekstni meniLastnosti." #. (para) #: ../source/TortoiseGit_en.xml:7524 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." -msgstr "Dodate lahko svoje lastne lastnosti ali nekatere lastnosti, ki imajo v sistemu Subversion poseben pomen. Te se začnejo s svn:. TakÅ¡na lastnost je svn:externals; kako se uporablja zunanje elemente, si poglejte v ." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgstr "Dodate lahko svoje lastne lastnosti ali nekatere lastnosti, ki imajo v sistemu Git poseben pomen. Te se začnejo s svn:. TakÅ¡na lastnost je svn:externals; kako se uporablja zunanje elemente, si poglejte v ." #. (title) #: ../source/TortoiseGit_en.xml:7531 @@ -6464,18 +6464,18 @@ msgstr "Stisnjena kombinacija prejÅ¡njih Å¡tirih ključnih besed." #. (para) #: ../source/TortoiseGit_en.xml:7538 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " -msgstr "Subversion omogoča (podobno kot sistem CVS) razÅ¡iritev ključnih besed, ki se lahko uporabljajo za vstavljanje imena datoteke in Å¡tevilke revizije v vsebino datoteke. Trenutno so podprte naslednje ključne besede: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgstr "Git omogoča (podobno kot sistem CVS) razÅ¡iritev ključnih besed, ki se lahko uporabljajo za vstavljanje imena datoteke in Å¡tevilke revizije v vsebino datoteke. Trenutno so podprte naslednje ključne besede: " #. (para) #: ../source/TortoiseGit_en.xml:7589 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." -msgstr "O uporabi teh ključnih besed si lahko več preberete v poglavju svn:keywords section knjige The Subversion Book. Tam dobite popoln opis ključnih besed in njihove uporabe." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." +msgstr "O uporabi teh ključnih besed si lahko več preberete v poglavju svn:keywords section knjige The Git Book. Tam dobite popoln opis ključnih besed in njihove uporabe." #. (para) #: ../source/TortoiseGit_en.xml:7599 -msgid "For more information about properties in Subversion see the Special Properties." -msgstr "Več informacij o lastnostih v sistemu Subversion dobite na naslovu Special Properties." +msgid "For more information about properties in Git see the Special Properties." +msgstr "Več informacij o lastnostih v sistemu Git dobite na naslovu Special Properties." #. (title) #: ../source/TortoiseGit_en.xml:7606 @@ -6579,13 +6579,13 @@ msgstr "auto-props" #. (para) #: ../source/TortoiseGit_en.xml:7717 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." -msgstr "Subversion in TortoiseGit lahko prilagodite tako, da se lastnosti samodejno nastavijo datotekam in mapam, ko se te dodajo v skladišče. To lahko storite na dva načina." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgstr "Git in TortoiseGit lahko prilagodite tako, da se lastnosti samodejno nastavijo datotekam in mapam, ko se te dodajo v skladišče. To lahko storite na dva načina." #. (para) #: ../source/TortoiseGit_en.xml:7722 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." -msgstr "To zmožnost lahko vključite neposredno v konfiguracijski datoteki za Subversion. Na strani SploÅ¡no v nastavitvah se nahaja gumb, ki odpre konfiguracijsko datoteko v urejevalniku besedil. Konfiguracijska datoteka je besedilna datoteka, s katero nastavite določene zmožnosti programa Subversion. Spremeniti morate dve stvari: najprej v odseku miscellany izbriÅ¡ite komentar pred vrstico enable-auto-props = yes. Nato v naslednjem odseku definirajte, katere lastnosti naj se pripnejo določenim vrstam datotek. S tem določite nastavitve, ki veljajo za vse odjemalce Subversion, vendar jih je potrebno nastaviti na vsakem odjemalcu posebej - možnost, da jih nastavite v skladišču, od koder jih odjemalci preberejo, ne obstaja." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgstr "To zmožnost lahko vključite neposredno v konfiguracijski datoteki za Git. Na strani SploÅ¡no v nastavitvah se nahaja gumb, ki odpre konfiguracijsko datoteko v urejevalniku besedil. Konfiguracijska datoteka je besedilna datoteka, s katero nastavite določene zmožnosti programa Git. Spremeniti morate dve stvari: najprej v odseku miscellany izbriÅ¡ite komentar pred vrstico enable-auto-props = yes. Nato v naslednjem odseku definirajte, katere lastnosti naj se pripnejo določenim vrstam datotek. S tem določite nastavitve, ki veljajo za vse odjemalce Git, vendar jih je potrebno nastaviti na vsakem odjemalcu posebej - možnost, da jih nastavite v skladišču, od koder jih odjemalci preberejo, ne obstaja." #. (para) #: ../source/TortoiseGit_en.xml:7739 @@ -6609,8 +6609,8 @@ msgstr "Objavite lastnosti" #. (para) #: ../source/TortoiseGit_en.xml:7759 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." -msgstr "Lastnosti v sistemu Subversion so pod nadzorom različic. Potem, ko spremenite ali dodate lastnosti, morate spremembe objaviti." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." +msgstr "Lastnosti v sistemu Git so pod nadzorom različic. Potem, ko spremenite ali dodate lastnosti, morate spremembe objaviti." #. (title) #: ../source/TortoiseGit_en.xml:7765 @@ -6619,8 +6619,8 @@ msgstr "Spori pri lastnostih" #. (para) #: ../source/TortoiseGit_en.xml:7766 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." -msgstr "Če pri objavi sprememb pride do spora, ker je nek drug uporabnik sprememnil isto lastnost, Subversion ustvari datoteko .prej. Ko reÅ¡ite spor, to datoteko izbriÅ¡ite." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." +msgstr "Če pri objavi sprememb pride do spora, ker je nek drug uporabnik sprememnil isto lastnost, Git ustvari datoteko .prej. Ko reÅ¡ite spor, to datoteko izbriÅ¡ite." #. (title) #: ../source/TortoiseGit_en.xml:7775 @@ -6659,8 +6659,8 @@ msgstr "tsvn:logtemplate se uporablja pri projektih, kjer je #. (para) #: ../source/TortoiseGit_en.xml:7831 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." -msgstr "Subversion omogoča nastavljanje samodejnih lastnosti (autoprops), ki se nastavijo vsem novim ali uvoženim datotekam, odvisno od končnice datoteke. Vsak uporabnik mora imeti v svoji konfiguracijski datoteki odjemalca nastavljene ustrezne samodejne lastnosti. Lastnost tsvn:autoprops lahko nastavite tudi neposredno na mapah. Pri dodajanju ali uvažanju datotek se te lastnosti spojijo z lastnostmi, ki so nastavljene v konfiguracijski datoteki. Oblika je enaka kot pri samodejnih lastnostih Subversion, n. pr: *.sh = svn:eol-style=native;svn:executable nastavi dve lastnosti na datotekah s končnico .sh." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgstr "Git omogoča nastavljanje samodejnih lastnosti (autoprops), ki se nastavijo vsem novim ali uvoženim datotekam, odvisno od končnice datoteke. Vsak uporabnik mora imeti v svoji konfiguracijski datoteki odjemalca nastavljene ustrezne samodejne lastnosti. Lastnost tsvn:autoprops lahko nastavite tudi neposredno na mapah. Pri dodajanju ali uvažanju datotek se te lastnosti spojijo z lastnostmi, ki so nastavljene v konfiguracijski datoteki. Oblika je enaka kot pri samodejnih lastnostih Git, n. pr: *.sh = svn:eol-style=native;svn:executable nastavi dve lastnosti na datotekah s končnico .sh." #. (para) #: ../source/TortoiseGit_en.xml:7844 @@ -6746,8 +6746,8 @@ msgstr "Ko s pomočjo programa TortoiseGit dodate nove podmape, se tja samodejno #. (para) #: ../source/TortoiseGit_en.xml:7964 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." -msgstr "Čeprav so projektne lastnosti TortoiseGit zelo uporabne, delujejo le z odjemalcem TortoiseGit, nekatere celo samo z novejÅ¡imi različicami TortoiseGit. Če uporabniki na vaÅ¡em projektu uporabljajo različne odjemalce za Subversion ali pa starejÅ¡e različice TortoiseGit, raje uporabite skripte akcij v skladišču za zagotavljanje spoÅ¡tovanja pravil. Lastnosti tsvn: vam le pomagajo nastaviti pravila, ne morejo pa jih zagotavljati." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgstr "Čeprav so projektne lastnosti TortoiseGit zelo uporabne, delujejo le z odjemalcem TortoiseGit, nekatere celo samo z novejÅ¡imi različicami TortoiseGit. Če uporabniki na vaÅ¡em projektu uporabljajo različne odjemalce za Git ali pa starejÅ¡e različice TortoiseGit, raje uporabite skripte akcij v skladišču za zagotavljanje spoÅ¡tovanja pravil. Lastnosti tsvn: vam le pomagajo nastaviti pravila, ne morejo pa jih zagotavljati." #. (title) #: ../source/TortoiseGit_en.xml:7977 @@ -6778,8 +6778,8 @@ msgstr "Å e ena lastnost sistemov za nadzor različic je možnost označevanja d #. (para) #: ../source/TortoiseGit_en.xml:8007 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." -msgstr "Subversion nima posebnih ukazov za ustvarjanje vej ali oznak, ampak uporablja takoimenovane poceni kopije. Poceni kopije so podobne povezavam (hard links) v sistemu Unix, kar pomeni, da se namesto ustvarjanja kopije skladišča naredi notranja povezava, ki kaže na določeno drevo/revizijo. Zato je ustvarjanje vej in oznak zelo hitro, hkrati pa ne zavzema skoraj nobenega dodatnega prostora v skladišču." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgstr "Git nima posebnih ukazov za ustvarjanje vej ali oznak, ampak uporablja takoimenovane poceni kopije. Poceni kopije so podobne povezavam (hard links) v sistemu Unix, kar pomeni, da se namesto ustvarjanja kopije skladišča naredi notranja povezava, ki kaže na določeno drevo/revizijo. Zato je ustvarjanje vej in oznak zelo hitro, hkrati pa ne zavzema skoraj nobenega dodatnega prostora v skladišču." #. (title) #: ../source/TortoiseGit_en.xml:8017 @@ -6925,8 +6925,8 @@ msgstr "Če spremenite delovno kopijo, ustvarjeno iz veje, in jo objavite, gredo #. (para) #: ../source/TortoiseGit_en.xml:8194 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " -msgstr "Čeprav Subversion ne razlikuje med oznakami in vejami, se pri pri tipični uporabi ta dva ukaza nekoliko razlikujeta. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgstr "Čeprav Git ne razlikuje med oznakami in vejami, se pri pri tipični uporabi ta dva ukaza nekoliko razlikujeta. " #. (title) #: ../source/TortoiseGit_en.xml:8238 @@ -6951,8 +6951,8 @@ msgstr "Kadar se veje uporabljajo za ločeno razvijanje, kasneje želite spremem #. (para) #: ../source/TortoiseGit_en.xml:8248 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." -msgstr "Pomembno je, da pred uporabo razumete, kako ustvarjanje vej in oznak v sistemu Subversion poteka. Vse skupaj lahko postane precej zapleteno. Toplo priporočamo, da preberete poglavje Branching and Merging v knjigi The Subversion Book, ki poda popoln opis in veliko primerov, kako ukaza uporabljati. " +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." +msgstr "Pomembno je, da pred uporabo razumete, kako ustvarjanje vej in oznak v sistemu Git poteka. Vse skupaj lahko postane precej zapleteno. Toplo priporočamo, da preberete poglavje Branching and Merging v knjigi The Git Book, ki poda popoln opis in veliko primerov, kako ukaza uporabljati. " #. (para) #: ../source/TortoiseGit_en.xml:8258 @@ -6986,8 +6986,8 @@ msgstr "Ta metoda pokriva primer, ko ste na veji (ali na glavni veji) naredili s #. (para) #: ../source/TortoiseGit_en.xml:8300 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." -msgstr "Od Subversiona zahtevate naslednje: Izračunaj spremembe, ki so potrebne, da iz revizije 1 ([OD]) veje A dobimo revizijo 7 ([DO]) veje A, in spremembe namesti na delovno kopijo (glavne ali stranske veje B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgstr "Od Gita zahtevate naslednje: Izračunaj spremembe, ki so potrebne, da iz revizije 1 ([OD]) veje A dobimo revizijo 7 ([DO]) veje A, in spremembe namesti na delovno kopijo (glavne ali stranske veje B)." #. (term) #. (title) @@ -6998,12 +6998,12 @@ msgstr "Vključitev veje" #. (para) #: ../source/TortoiseGit_en.xml:8311 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." -msgstr "Ta način se uporablja v primeru, ko ustvarite vejo za razvoj neke zmožnosti programa, kot je to opisano v knjigi The Subversion Book. Vse spremembe, ki so se dogajale na glavni veji, ste vsak teden spajali na vejo. Sedaj je razvoj nove zmožnosti končan, zato želite to kodo spojiti na glavno vejo. Ker ste vejo ves čas sihnronizirali z glavno vejo, sta stranska in glavna veja identični, le da stranska veja vsebuje kodo za novo zmožnost." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgstr "Ta način se uporablja v primeru, ko ustvarite vejo za razvoj neke zmožnosti programa, kot je to opisano v knjigi The Git Book. Vse spremembe, ki so se dogajale na glavni veji, ste vsak teden spajali na vejo. Sedaj je razvoj nove zmožnosti končan, zato želite to kodo spojiti na glavno vejo. Ker ste vejo ves čas sihnronizirali z glavno vejo, sta stranska in glavna veja identični, le da stranska veja vsebuje kodo za novo zmožnost." #. (para) #: ../source/TortoiseGit_en.xml:8320 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "To je poseben primer spajanja dreves (opisano spodaj) in zahteva zgolj naslov URL, iz katerega spajate (običajno stranska veja, na kateri ste razvijali novo zmožnost). S sledenjem spajanja se izračuna pravilno območje spajanja in preveri, ali je stranska veja sinhronizirana z glavno. Na ta način preprečimo izgubo objavljenih sprememb na glavni veji od zadnje sinhronizacije." #. (para) @@ -7018,13 +7018,13 @@ msgstr "Spoji dveh različni drevesi" #. (para) #: ../source/TortoiseGit_en.xml:8340 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." -msgstr "To je bolj sploÅ¡en primer vključitve veje. V tem primeru od Subversiona zahtevate naslednje:Izračunaj spremembe, ki so potrebne, da iz revizije HEAD ([OD]) na glavni veji dobimo revizijo HEAD ([DO]) na stranski veji, in spremembe namesti na delovno kopijo (glavne veje). Rezultat postopka sta identični glavna in stranska veja." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgstr "To je bolj sploÅ¡en primer vključitve veje. V tem primeru od Gita zahtevate naslednje:Izračunaj spremembe, ki so potrebne, da iz revizije HEAD ([OD]) na glavni veji dobimo revizijo HEAD ([DO]) na stranski veji, in spremembe namesti na delovno kopijo (glavne veje). Rezultat postopka sta identični glavna in stranska veja." #. (para) #: ../source/TortoiseGit_en.xml:8348 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." -msgstr "Če vaÅ¡ strežnik ne podpira sledenja spajanja, lahko spremembe na stranski veji spojite na glavno le s tem načinom. Drug primer je uporaba vej zunanje kode (vendor branches), kjer morate spremembe, ki jih je naredil zunanji izvajalec, spojiti v svojo glavno vejo. Za več informacij preberite vendor branches v knjigi The Subversion Book." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." +msgstr "Če vaÅ¡ strežnik ne podpira sledenja spajanja, lahko spremembe na stranski veji spojite na glavno le s tem načinom. Drug primer je uporaba vej zunanje kode (vendor branches), kjer morate spremembe, ki jih je naredil zunanji izvajalec, spojiti v svojo glavno vejo. Za več informacij preberite vendor branches v knjigi The Git Book." #. (title) #: ../source/TortoiseGit_en.xml:8363 @@ -7068,8 +7068,8 @@ msgstr "Če ste že spajali s te veje, ste verjetno v sporočilo objave vpisali #. (para) #: ../source/TortoiseGit_en.xml:8419 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." -msgstr "Če uporabljete sledenje spajanja, vam ni potrebno vedeti, katere revizije ste že spojili - Subversion si jih zapomni. Če pustite polje za vnos območja revizij prazno, bodo samodejno vključene vse revizije, ki Å¡e niso bile spojene. Za več informacij preberite ." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgstr "Če uporabljete sledenje spajanja, vam ni potrebno vedeti, katere revizije ste že spojili - Git si jih zapomni. Če pustite polje za vnos območja revizij prazno, bodo samodejno vključene vse revizije, ki Å¡e niso bile spojene. Za več informacij preberite ." #. (para) #: ../source/TortoiseGit_en.xml:8427 @@ -7163,8 +7163,8 @@ msgstr "Določite lahko globino spajanja, ki pove, kako globoko v delovno kopijo #. (para) #: ../source/TortoiseGit_en.xml:8529 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" -msgstr "V večini primerov želite pri spajanju upoÅ¡tevati zgodovino datoteke, tako da se spojijo spremembe, ki so relativne na skupnega prednika. Včasih morate spojiti datoteke, ki so morda povezane, vendar ne v vaÅ¡em skladišču. Primer: uvozili ste verziji 1 in 2 knjižnice, ki jo je izdelalo neko drugo podjetje. Čeprav sta verziji logično povezani, Subversion o tem ne ve nič, saj vidi le uvožena paketa. Če poskusite spojiti spremembe med tema dvema drevesoma, boste videli, da bo prva verzija odstranjena, druga pa dodana. Da bi Subversion upoÅ¡teval razlike na osnovi poti in ne na osnovi zgodovine, potrdite polje Prezri dedovanje. Več o tem preberite v knjigi The Subversion book, Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" +msgstr "V večini primerov želite pri spajanju upoÅ¡tevati zgodovino datoteke, tako da se spojijo spremembe, ki so relativne na skupnega prednika. Včasih morate spojiti datoteke, ki so morda povezane, vendar ne v vaÅ¡em skladišču. Primer: uvozili ste verziji 1 in 2 knjižnice, ki jo je izdelalo neko drugo podjetje. Čeprav sta verziji logično povezani, Git o tem ne ve nič, saj vidi le uvožena paketa. Če poskusite spojiti spremembe med tema dvema drevesoma, boste videli, da bo prva verzija odstranjena, druga pa dodana. Da bi Git upoÅ¡teval razlike na osnovi poti in ne na osnovi zgodovine, potrdite polje Prezri dedovanje. Več o tem preberite v knjigi The Git book, Noticing or Ignoring Ancestry" #. (para) #: ../source/TortoiseGit_en.xml:8546 @@ -7198,13 +7198,13 @@ msgstr "Spajanje je sedaj zaključeno. Dobra praksa je, da rezultat spajanja pre #. (para) #: ../source/TortoiseGit_en.xml:8590 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." -msgstr "Pri uporabi odjemalcev in strežnika Suversion pred različico 1.5 se informacije o spajanju ne shranjujejo in jih je zato treba voditi ločeno. Ko ste spajanje preverili in ste pripravljeni na objavo spojene revizije, v sporočilo dnevniÅ¡kega zapisa vedno vpiÅ¡ite Å¡tevilke revizij, ki ste jih prenesli. Če boste kasneje spet spajali s te veje, boste morali vedeti, katere revizije ste že spojili. Sprememb ne smete spajati dvakrat. Za več informacij preberite Best Practices for Merging v knjigi The Subversion book." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." +msgstr "Pri uporabi odjemalcev in strežnika Suversion pred različico 1.5 se informacije o spajanju ne shranjujejo in jih je zato treba voditi ločeno. Ko ste spajanje preverili in ste pripravljeni na objavo spojene revizije, v sporočilo dnevniÅ¡kega zapisa vedno vpiÅ¡ite Å¡tevilke revizij, ki ste jih prenesli. Če boste kasneje spet spajali s te veje, boste morali vedeti, katere revizije ste že spojili. Sprememb ne smete spajati dvakrat. Za več informacij preberite Best Practices for Merging v knjigi The Git book." #. (para) #: ../source/TortoiseGit_en.xml:8604 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." -msgstr "Če strežnik in vsi odjemalci uporabljajo Subversion 1.5 ali novejÅ¡i, zmožnost sledenje spajanja shrani spojene revizije in prepreči večkratno spajanje iste revizije. S tem si precej olajÅ¡ate delo, saj lahko vedno izberete celotno območje revizij, spojene pa bodo le nove revizije." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgstr "Če strežnik in vsi odjemalci uporabljajo Git 1.5 ali novejÅ¡i, zmožnost sledenje spajanja shrani spojene revizije in prepreči večkratno spajanje iste revizije. S tem si precej olajÅ¡ate delo, saj lahko vedno izberete celotno območje revizij, spojene pa bodo le nove revizije." #. (para) #: ../source/TortoiseGit_en.xml:8611 @@ -7218,8 +7218,8 @@ msgstr "V tem primeru veje za razvoj nove zmožnosti ne potrebujete več, ker st #. (para) #: ../source/TortoiseGit_en.xml:8626 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." -msgstr "Subversion ne more spojiti datoteke z mapo in obratno - spaja lahko mape v mape in datoteke v datoteke. Če izberete datoteko in odprete okno za spajanje, potem morate v oknu navesti pot do datoteke. Če izberete mapo in odprete okno, potem morate vnesti naslov URL mape za spajanje." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgstr "Git ne more spojiti datoteke z mapo in obratno - spaja lahko mape v mape in datoteke v datoteke. Če izberete datoteko in odprete okno za spajanje, potem morate v oknu navesti pot do datoteke. Če izberete mapo in odprete okno, potem morate vnesti naslov URL mape za spajanje." #. (title) #: ../source/TortoiseGit_en.xml:8636 @@ -7234,7 +7234,7 @@ msgstr "sledenje spajanja" #. (para) #: ../source/TortoiseGit_en.xml:8646 msgid "You can avoid the danger of merging the same revision twice (repeated merge problem). Once a revision is marked as having been merged, future merges which include that revision in the range will skip over it." -msgstr "Večkratnemu spajanju iste revizije se lahko izognete. Ko je revizija označena kot spojena, jo bo Subversion pri naslednjih poskusil enostavno preskočil." +msgstr "Večkratnemu spajanju iste revizije se lahko izognete. Ko je revizija označena kot spojena, jo bo Git pri naslednjih poskusil enostavno preskočil." #. (para) #: ../source/TortoiseGit_en.xml:8652 @@ -7253,8 +7253,8 @@ msgstr "Revizije lahko označite kot ne spajaj. To storite #. (para) #: ../source/TortoiseGit_en.xml:8640 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " -msgstr "Subversion 1.5 prinaÅ¡a zmožnost sledenja spajanja. Ko spajate spremembe iz enega drevesa v drugega, se Å¡tevilke spojenih revizij shranijo. Te informacije se lahko nato uporabijo za različne namene. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgstr "Git 1.5 prinaÅ¡a zmožnost sledenja spajanja. Ko spajate spremembe iz enega drevesa v drugega, se Å¡tevilke spojenih revizij shranijo. Te informacije se lahko nato uporabijo za različne namene. " #. (para) #: ../source/TortoiseGit_en.xml:8670 @@ -7263,8 +7263,8 @@ msgstr "Informacije o sledenju spajanja odjemalec ob spajanju shrani v lastnost #. (para) #: ../source/TortoiseGit_en.xml:8680 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." -msgstr "Več o sledenju spajanja preberite na strani Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." +msgstr "Več o sledenju spajanja preberite na strani Merge tracking documentation." #. (title) #: ../source/TortoiseGit_en.xml:8688 @@ -7373,18 +7373,18 @@ msgstr "VaÅ¡e podjetje je v preteklosti vedno uporabljalo nadzor različic z zak #. (para) #: ../source/TortoiseGit_en.xml:8801 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " -msgstr "Subversion v sploÅ¡nem najbolje deluje brez zaklepanja, z uporabo modela kopiraj-spremeni-spoji, kot je to opisano v . Se pa vseeno pojavijo situacije, kjer je potrebno uveljaviti določeno obliko zaklepanja. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgstr "Git v sploÅ¡nem najbolje deluje brez zaklepanja, z uporabo modela kopiraj-spremeni-spoji, kot je to opisano v . Se pa vseeno pojavijo situacije, kjer je potrebno uveljaviti določeno obliko zaklepanja. " #. (para) #: ../source/TortoiseGit_en.xml:8825 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." -msgstr "Najprej morate strežnik nadgraditi na različico Subversion 1.2 ali novejÅ¡o. StarejÅ¡e različice namreč ne podpirajo zaklepanja. Če za dostop uporabljate protokol file://, potem morate seveda nadgraditi samo odjemalca." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgstr "Najprej morate strežnik nadgraditi na različico Git 1.2 ali novejÅ¡o. StarejÅ¡e različice namreč ne podpirajo zaklepanja. Če za dostop uporabljate protokol file://, potem morate seveda nadgraditi samo odjemalca." #. (title) #: ../source/TortoiseGit_en.xml:8832 -msgid "How Locking Works in Subversion" -msgstr "Zaklepanje v sistemu Subversion" +msgid "How Locking Works in Git" +msgstr "Zaklepanje v sistemu Git" #. (para) #: ../source/TortoiseGit_en.xml:8833 @@ -7398,7 +7398,7 @@ msgstr "Če za datoteko pridobite zaklep, potem lahko le #. (para) #: ../source/TortoiseGit_en.xml:8846 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." msgstr "Ni pa nujno, da uporabniki vedo, da ste datoteko zaklenili. Če statusa zaklepanja ne preverjajo redno, bodo to opazili Å¡ele, ko bo puskusili datoteko objaviti in objava ne bo uspeÅ¡na. To pa ni najbolj uporabno. Da bi bilo delo z zaklepi lažje, je na voljo nova lastnost svn:needs-lock. Če je ta lastnost nastavljena (na katerokoli vrednost), bo krajevna kopija datoteke ob prevzemu ali posodobitvi na voljo samo za branje, razen če je ta delovna kopija lastnica zaklepa za to datoteko. To deluje kot opozorilo, da datoteke ne urejajte, preden zanjo niste pridobili zaklepa. Datoteke pod nadzorom različic, ki so hkrati tudi označene samo za branje, imajo v programu TortoiseGit posebno prekrivno ikono, ki vas opozarja, da morate pred urejanjem pridobiti zaklep." #. (para) @@ -7408,8 +7408,8 @@ msgstr "Zaklep se pridobi za določeno delovno kopijo in lastnika. Če imate v l #. (para) #: ../source/TortoiseGit_en.xml:8868 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." -msgstr "Če eden od vaÅ¡ih sodelavcev pridobi zaklep in odide na dopust, ne da bi zaklep sprostil, kaj storite? Subversion omogoča, da prisilno prevzamete zaklep. Sprostitev zaklepa nekoga drugega je znana pod imenom prelom zaklepa, prisilen prevzem zaklepa, ki je v lasti nekoga drugega, pa kraja zaklepa. Seveda teh ukazov ne smete zlorabljati, če želite ostati v dobrih odnosih s sodelavci." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgstr "Če eden od vaÅ¡ih sodelavcev pridobi zaklep in odide na dopust, ne da bi zaklep sprostil, kaj storite? Git omogoča, da prisilno prevzamete zaklep. Sprostitev zaklepa nekoga drugega je znana pod imenom prelom zaklepa, prisilen prevzem zaklepa, ki je v lasti nekoga drugega, pa kraja zaklepa. Seveda teh ukazov ne smete zlorabljati, če želite ostati v dobrih odnosih s sodelavci." #. (para) #: ../source/TortoiseGit_en.xml:8878 @@ -7478,8 +7478,8 @@ msgstr "Izognite se prelamljanju in kraji zaklepov" #. (para) #: ../source/TortoiseGit_en.xml:8969 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." -msgstr "Če nekomu prelomite ali ukradete zaklep, ne da bi uporabniku to povedali, lahko povzročite izgubo podatkov. Če delate z datotekami, ki se jih ne da spajati, in nekomu ukradete zaklep, lahko ta uporabnik po vaÅ¡i sprostitvi zaklepa objavi svojo različico datoteke in s tem povozi vaÅ¡o. Subversion nikoli ne izgubi podatkov, izgubite pa lahko varnost dela v teamu, ki vam jo daje zaklepanje. " +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." +msgstr "Če nekomu prelomite ali ukradete zaklep, ne da bi uporabniku to povedali, lahko povzročite izgubo podatkov. Če delate z datotekami, ki se jih ne da spajati, in nekomu ukradete zaklep, lahko ta uporabnik po vaÅ¡i sprostitvi zaklepa objavi svojo različico datoteke in s tem povozi vaÅ¡o. Git nikoli ne izgubi podatkov, izgubite pa lahko varnost dela v teamu, ki vam jo daje zaklepanje. " #. (title) #: ../source/TortoiseGit_en.xml:8981 @@ -7493,7 +7493,7 @@ msgstr "Kot je že bilo omenjeno, je najbolj učinkovita metoda za uporabo zakle #. (para) #: ../source/TortoiseGit_en.xml:8992 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." msgstr "Če velja na projektu pravilo, da je potrebno vsako datoteko zakleniti, potem bo verjetno lažje, da uporabite samodejne lastnosti (auto-props). Tako bo ta lastnost samodejno pripeta vsaki novo dodani datoteki. Za nadaljnje informacije preberite ." #. (title) @@ -7503,8 +7503,8 @@ msgstr "Ukazna datoteka akcije za zaklepanje" #. (para) #: ../source/TortoiseGit_en.xml:9002 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." -msgstr "Ko ustvarite novo skladišče s sistemom Subversion 1.2 ali novejÅ¡im, se v podmapi hooks ustvarijo Å¡tiri predloge za ukazne datoteke akcij. Kličejo se pred in po pridobivanju zaklepa ter pred in po sprostitvi zaklepa." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgstr "Ko ustvarite novo skladišče s sistemom Git 1.2 ali novejÅ¡im, se v podmapi hooks ustvarijo Å¡tiri predloge za ukazne datoteke akcij. Kličejo se pred in po pridobivanju zaklepa ter pred in po sprostitvi zaklepa." #. (para) #: ../source/TortoiseGit_en.xml:9008 @@ -8170,8 +8170,8 @@ msgstr "Spremembe lahko iz izbranih revizij spojite tudi v drugo delovno kopijo. #. (para) #: ../source/TortoiseGit_en.xml:9848 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." -msgstr "Ker Subversion ne more vedno zagotoviti vseh informacij, ki jih potrebujete, je potrebna določena razlaga podatkov, kar lahko pripelje do čudnih zaključkov. Vseeno pa prikaz za glavno vejo (trunk) običajno da uporabne rezultate." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgstr "Ker Git ne more vedno zagotoviti vseh informacij, ki jih potrebujete, je potrebna določena razlaga podatkov, kar lahko pripelje do čudnih zaključkov. Vseeno pa prikaz za glavno vejo (trunk) običajno da uporabne rezultate." #. (para) #: ../source/TortoiseGit_en.xml:9858 @@ -8185,8 +8185,8 @@ msgstr "Če uporabljate predpomnilnik dnevnika in menite, da se je sporočilo dn #. (title) #: ../source/TortoiseGit_en.xml:9877 -msgid "Exporting a Subversion Working Copy" -msgstr "Izvažanje delovne kopije sistema Subversion" +msgid "Exporting a Git Working Copy" +msgstr "Izvažanje delovne kopije sistema Git" #. (primary) #: ../source/TortoiseGit_en.xml:9879 @@ -8240,8 +8240,8 @@ msgstr "Izvažanje posameznih datotek" #. (para) #: ../source/TortoiseGit_en.xml:9952 -msgid "The export dialog does not allow exporting single files, even though Subversion can." -msgstr "Pogovorno okno za izvažanje ne dovoli izvažanja posameznih datotek, čeprav je Subversion to zmožen narediti." +msgid "The export dialog does not allow exporting single files, even though Git can." +msgstr "Pogovorno okno za izvažanje ne dovoli izvažanja posameznih datotek, čeprav je Git to zmožen narediti." #. (para) #: ../source/TortoiseGit_en.xml:9956 @@ -8332,8 +8332,8 @@ msgstr "Ta operacija se uporablja zelo redko. Ukaz Premesti #. (para) #: ../source/TortoiseGit_en.xml:10046 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." -msgstr "se želite premakniti v drugo skladišče Subversion. V tem primeru je najbolje narediti svež prevzem iz novega skladišča." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." +msgstr "se želite premakniti v drugo skladišče Git. V tem primeru je najbolje narediti svež prevzem iz novega skladišča." #. (para) #: ../source/TortoiseGit_en.xml:10052 @@ -8377,8 +8377,8 @@ msgstr "sledilnik zadev" #. (para) #: ../source/TortoiseGit_en.xml:10086 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." -msgstr "V razvoju programske opreme se pogosto dogaja, da so spremembe vezane na določenega hrošča ali Å¡tevilko zadeve. Uporabniki sistemov za sledenje zadev pogosto želijo asociirati spremembe v sistemu Subversion z določeno Å¡tevilko zadeve v sistemu za sledenje zadev. Večina sistemov za sledenje zadev omogoča pisanje ukaznih datotek akcije pred objavo, ki pregleda sporočilo dnevniÅ¡kega zapisa in poišče Å¡tevilko zadeve. Tak način je podvržen napakam, saj se zanaÅ¡a na dejstvo, da bodo uporabniki napisali sporočilo dnevniÅ¡kega zapisa v pravilni obliki." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgstr "V razvoju programske opreme se pogosto dogaja, da so spremembe vezane na določenega hrošča ali Å¡tevilko zadeve. Uporabniki sistemov za sledenje zadev pogosto želijo asociirati spremembe v sistemu Git z določeno Å¡tevilko zadeve v sistemu za sledenje zadev. Večina sistemov za sledenje zadev omogoča pisanje ukaznih datotek akcije pred objavo, ki pregleda sporočilo dnevniÅ¡kega zapisa in poišče Å¡tevilko zadeve. Tak način je podvržen napakam, saj se zanaÅ¡a na dejstvo, da bodo uporabniki napisali sporočilo dnevniÅ¡kega zapisa v pravilni obliki." #. (para) #: ../source/TortoiseGit_en.xml:10099 @@ -8418,7 +8418,7 @@ msgstr "Nastavite vrednost te lastnosti na naslov URL orodja za sledenje zadev. #. (para) #: ../source/TortoiseGit_en.xml:10152 msgid "You can also use relative URLs instead of absolute ones. This is useful when your issue tracker is on the same domain/server as your source repository. In case the domain name ever changes, you don't have to adjust the bugtraq:url property. There are two ways to specify a relative URL:" -msgstr "Namesto absolutnih lahko uporabljate tudi relativne naslove URL. To je uporabno v primeru, ko je sledilnik zadev na isti domeni/strežniku kot skladišče Subversion. Če se ime domeni kdaj spremeni, vam tako ni potrebno spreminjati lastnosti bugtraq:url. Obstajata dva načina, kako določiti relativen naslov URL:" +msgstr "Namesto absolutnih lahko uporabljate tudi relativne naslove URL. To je uporabno v primeru, ko je sledilnik zadev na isti domeni/strežniku kot skladišče Git. Če se ime domeni kdaj spremeni, vam tako ni potrebno spreminjati lastnosti bugtraq:url. Obstajata dva načina, kako določiti relativen naslov URL:" #. (para) #: ../source/TortoiseGit_en.xml:10159 @@ -8553,8 +8553,8 @@ msgstr "Zgolj za lastnosti tsvn: lahko u #. (para) #: ../source/TortoiseGit_en.xml:10391 -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification." -msgstr "Integracija s sistemi za sledenje zadev ni omejena na TortoiseGit; uporabite jo lahko s katerimkoli odjemalcem za sistem Subversion. Za več informacij preberite Issue Tracker Integration Specification." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification." +msgstr "Integracija s sistemi za sledenje zadev ni omejena na TortoiseGit; uporabite jo lahko s katerimkoli odjemalcem za sistem Git. Za več informacij preberite Issue Tracker Integration Specification." #. (title) #: ../source/TortoiseGit_en.xml:10400 @@ -8603,8 +8603,8 @@ msgstr "ViewCS" #. (para) #: ../source/TortoiseGit_en.xml:10449 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." -msgstr "Obstaja kar nekaj spletnih pregledovalnikov skladišč za Subversion, n. pr. ViewVC in WebSVN. TortoiseGit nudi možnost povezave s temi pregledovalniki." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgstr "Obstaja kar nekaj spletnih pregledovalnikov skladišč za Git, n. pr. ViewVC in WebSVN. TortoiseGit nudi možnost povezave s temi pregledovalniki." #. (para) #: ../source/TortoiseGit_en.xml:10461 @@ -8658,8 +8658,8 @@ msgstr "Okno za nastavitve, SploÅ¡no" #. (para) #: ../source/TortoiseGit_en.xml:10562 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." -msgstr " To okno vam omogoča nastavitev jezika in nastavitev, specifičnih za Subversion." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." +msgstr " To okno vam omogoča nastavitev jezika in nastavitev, specifičnih za Git." #. (term) #: ../source/TortoiseGit_en.xml:10572 @@ -8728,13 +8728,13 @@ msgstr "SploÅ¡ni vzorec prezrtih elementov se uporablja za skrivanje datotek bre #. (para) #: ../source/TortoiseGit_en.xml:10644 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." -msgstr "UpoÅ¡tevajte, da bodo vzorci prezrtih elementov, ki jih nastavite tukaj, vplivali tudi na druge odjemalce za Subversion, ki so nameščeni na vaÅ¡em računalniku, vključno z odjemalcem za ukazno vrstico." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." +msgstr "UpoÅ¡tevajte, da bodo vzorci prezrtih elementov, ki jih nastavite tukaj, vplivali tudi na druge odjemalce za Git, ki so nameščeni na vaÅ¡em računalniku, vključno z odjemalcem za ukazno vrstico." #. (para) #: ../source/TortoiseGit_en.xml:10650 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." -msgstr "Če uporabljate konfiguracijsko datoteko Subversion za nastavljanje sploÅ¡nega vzorca prezrtih, bodo nastavitve, ki so nastavite tu, povožene. Do konfiguracijske datoteke Subversion dostopate z gumbom Uredi, kot je opisano spodaj." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." +msgstr "Če uporabljate konfiguracijsko datoteko Git za nastavljanje sploÅ¡nega vzorca prezrtih, bodo nastavitve, ki so nastavite tu, povožene. Do konfiguracijske datoteke Git dostopate z gumbom Uredi, kot je opisano spodaj." #. (para) #: ../source/TortoiseGit_en.xml:10658 @@ -8753,13 +8753,13 @@ msgstr "Ta možnost pove sistemu TortoiseGit, naj pri prevzemu ali posodobitvi p #. (term) #: ../source/TortoiseGit_en.xml:10686 -msgid "Subversion configuration file" -msgstr "Nastavitvena datoteka Subversion" +msgid "Git configuration file" +msgstr "Nastavitvena datoteka Git" #. (para) #: ../source/TortoiseGit_en.xml:10688 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." -msgstr "Za neposredno urejanje konfiguracijske datoteke sistema Subversion uporabite ukaz Uredi. Nekaterih nastavitev ne morete nastaviti preko grafičnega vmesnika TortoiseGit, zato jih morate nastaviti tukaj. Za več informacij o konfiguracijski datoteki (config) poglejte na stran Runtime Configuration Area. Razdelek Automatic Property Setting je Å¡e posebej zanimiv. UpoÅ¡tevajte, da sistem Subversion lahko bere informacije o konfiguraciji na več mestih in da morate vedeti, katero mesto ima prioriteto. Za več informacij preberite Configuration and the Windows Registry." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgstr "Za neposredno urejanje konfiguracijske datoteke sistema Git uporabite ukaz Uredi. Nekaterih nastavitev ne morete nastaviti preko grafičnega vmesnika TortoiseGit, zato jih morate nastaviti tukaj. Za več informacij o konfiguracijski datoteki (config) poglejte na stran Runtime Configuration Area. Razdelek Automatic Property Setting je Å¡e posebej zanimiv. UpoÅ¡tevajte, da sistem Git lahko bere informacije o konfiguraciji na več mestih in da morate vedeti, katero mesto ima prioriteto. Za več informacij preberite Configuration and the Windows Registry." #. (term) #: ../source/TortoiseGit_en.xml:10713 @@ -8768,13 +8768,13 @@ msgstr "Uporabi mape _svn namesto .svn #. (para) #: ../source/TortoiseGit_en.xml:10715 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." -msgstr "VS.NET pri razvoju spletnih projektov ne zna delati z mapami .svn, ki jih Subversion uporablja za shranjevanje notranjih informacij. To ni napaka v sistemu Subversion, ampak v razvojnem okolju VS.NET in razÅ¡iritvah frontpage, ki jih uporablja. Za več informacij o tem problemu preberite ." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgstr "VS.NET pri razvoju spletnih projektov ne zna delati z mapami .svn, ki jih Git uporablja za shranjevanje notranjih informacij. To ni napaka v sistemu Git, ampak v razvojnem okolju VS.NET in razÅ¡iritvah frontpage, ki jih uporablja. Za več informacij o tem problemu preberite ." #. (para) #: ../source/TortoiseGit_en.xml:10722 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." -msgstr "Če želite spremeniti obnaÅ¡anje programov Subversion in TortoiseGit, lahko uporabite to potrditveno polje, da nastavite ustrezno okoljsko spremenljivko." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgstr "Če želite spremeniti obnaÅ¡anje programov Git in TortoiseGit, lahko uporabite to potrditveno polje, da nastavite ustrezno okoljsko spremenljivko." #. (para) #: ../source/TortoiseGit_en.xml:10727 @@ -8873,8 +8873,8 @@ msgstr "Izbira Samodejno zapri, če ni sporov Å¡e bolj omil #. (para) #: ../source/TortoiseGit_en.xml:10845 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." -msgstr "Izbira Samodejno zapri, če ni napak pomeni, da se pogovorno okno vedno zapre, tudi v primeru sporov. Okno ostane odprto le v primeru, če Subversion ne more dokončati operacije. Primer: posodobitev je neuspeÅ¡na, če strežnik ni dosegljiv, objava ni uspeÅ¡na, če je delovna kopija zastarela." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgstr "Izbira Samodejno zapri, če ni napak pomeni, da se pogovorno okno vedno zapre, tudi v primeru sporov. Okno ostane odprto le v primeru, če Git ne more dokončati operacije. Primer: posodobitev je neuspeÅ¡na, če strežnik ni dosegljiv, objava ni uspeÅ¡na, če je delovna kopija zastarela." #. (term) #: ../source/TortoiseGit_en.xml:10857 @@ -9243,13 +9243,13 @@ msgstr "Za poti, nastavljene v Izloči poti, TortoiseGit f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "Nastavitev f:\\development\\SVN\\Subversion onemogoči prikaz prekrivnih ikon le na točno tej mapi. Prekrivne ikone Å¡e vedno vidite na vseh datotekah in mapah znotraj te mape." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "Nastavitev f:\\development\\SVN\\Git onemogoči prikaz prekrivnih ikon le na točno tej mapi. Prekrivne ikone Å¡e vedno vidite na vseh datotekah in mapah znotraj te mape." #. (para) #: ../source/TortoiseGit_en.xml:11264 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "Nastavitev f:\\development\\SVN\\Subversion* onemogoči prikaz prekrivnih ikon na vseh datotekah in mapah, katerih pot se začne z f:\\development\\SVN\\Subversion. To pomeni, da na datotekah in mapah pod to potjo ne boste videli prekrivnih ikon." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "Nastavitev f:\\development\\SVN\\Git* onemogoči prikaz prekrivnih ikon na vseh datotekah in mapah, katerih pot se začne z f:\\development\\SVN\\Git. To pomeni, da na datotekah in mapah pod to potjo ne boste videli prekrivnih ikon." #. (para) #: ../source/TortoiseGit_en.xml:11271 @@ -9351,8 +9351,8 @@ msgstr " Tukaj lahko nastavite posredniÅ¡ki strežnik (proxy). M #. (para) #: ../source/TortoiseGit_en.xml:11366 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." -msgstr "Če želite posredniÅ¡ki strežnik nastaviti za vsako skladišče posebej, morate za to uporabiti datoteko servers sistema Subversion. Za neposreden dostop do te datoteke uporabite gumb Uredi. Za več informacij preberite Runtime Configuration Area." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgstr "Če želite posredniÅ¡ki strežnik nastaviti za vsako skladišče posebej, morate za to uporabiti datoteko servers sistema Git. Za neposreden dostop do te datoteke uporabite gumb Uredi. Za več informacij preberite Runtime Configuration Area." #. (para) #: ../source/TortoiseGit_en.xml:11376 @@ -9381,8 +9381,8 @@ msgstr "Da vam ne bi bilo potrebno vsakokrat vpisovati uporabniÅ¡kega imena in g #. (para) #: ../source/TortoiseGit_en.xml:11411 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." -msgstr "Nastavljanje SSH na strežniku in odjemalcih je malce bolj obsežen postopek, ki ne sodi v okvir te pomoči. Navodila lahko najdete med pogosto zastavljeni vpraÅ¡anji TortoiseGit: Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." +msgstr "Nastavljanje SSH na strežniku in odjemalcih je malce bolj obsežen postopek, ki ne sodi v okvir te pomoči. Navodila lahko najdete med pogosto zastavljeni vpraÅ¡anji TortoiseGit: Git/TortoiseGit SSH How-To." #. (title) #: ../source/TortoiseGit_en.xml:11421 @@ -9476,8 +9476,8 @@ msgstr "Če uporabljate lastnost svn:keywords za razÅ¡iritev #. (para) #: ../source/TortoiseGit_en.xml:11527 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." -msgstr "Lahko pa določite tudi drugo orodje za razlikovanje lastnosti v sistemu Subversion. Ker so lastnosti ponavadi enostavna kratka besedila, vam bo mogoče bolj ustrezal enostavnejÅ¡i pregledovalnik." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgstr "Lahko pa določite tudi drugo orodje za razlikovanje lastnosti v sistemu Git. Ker so lastnosti ponavadi enostavna kratka besedila, vam bo mogoče bolj ustrezal enostavnejÅ¡i pregledovalnik." #. (para) #: ../source/TortoiseGit_en.xml:11532 @@ -9653,8 +9653,8 @@ msgstr "Podatki avtentikacije" #. (para) #: ../source/TortoiseGit_en.xml:11760 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" -msgstr "Ko uporabljate avtentikacijo s strežnikom Subversion, se uporabniÅ¡ko ime in geslo shranita v krajevni datoteki in vam ju tako ni potrebno vedno znova vnaÅ¡ati. Te podatke boste morda želeli izbrisati - zaradi varnostnih razlogov ali pa zato, ker želite do skladišča dostopati z drugim uporabniÅ¡kim imenom ... ali Janez ve, da uporabljate njegov PC?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgstr "Ko uporabljate avtentikacijo s strežnikom Git, se uporabniÅ¡ko ime in geslo shranita v krajevni datoteki in vam ju tako ni potrebno vedno znova vnaÅ¡ati. Te podatke boste morda želeli izbrisati - zaradi varnostnih razlogov ali pa zato, ker želite do skladišča dostopati z drugim uporabniÅ¡kim imenom ... ali Janez ve, da uporabljate njegov PC?" #. (para) #: ../source/TortoiseGit_en.xml:11767 @@ -9893,8 +9893,8 @@ msgstr "Okno nastavitev, Ukazne datoteke akcij" #. (para) #: ../source/TortoiseGit_en.xml:12001 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." -msgstr " To okno vam omogoča nastavitev ukaznih datotek akcij, ki se izvedejo samodejno ob določeni operaciji sistema Subversion. V nasprotju s ukaznimi datotekami akcij, ki so razložene v , se te datoteke izvedejo krajevno na strani odjemalca." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgstr " To okno vam omogoča nastavitev ukaznih datotek akcij, ki se izvedejo samodejno ob določeni operaciji sistema Git. V nasprotju s ukaznimi datotekami akcij, ki so razložene v , se te datoteke izvedejo krajevno na strani odjemalca." #. (para) #: ../source/TortoiseGit_en.xml:12011 @@ -9973,7 +9973,7 @@ msgstr "Akcija pred posodobitvijo" #. (para) #: ../source/TortoiseGit_en.xml:12072 -msgid "Called before the actual Subversion update begins." +msgid "Called before the actual Git update begins." msgstr "Pokliče se, preden se posodobitev začne." #. (term) @@ -10080,8 +10080,8 @@ msgstr "Pomen vsakega izmed teh parametrov je podan tukaj: " #. (para) #: ../source/TortoiseGit_en.xml:12244 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." -msgstr "Če želite, da operacija Subversion čaka, dokler se ukazna datoteka akcije ne zaključi, potrdite polje Počakaj, da ukazna datoteka konča izvajanje." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." +msgstr "Če želite, da operacija Git čaka, dokler se ukazna datoteka akcije ne zaključi, potrdite polje Počakaj, da ukazna datoteka konča izvajanje." #. (para) #: ../source/TortoiseGit_en.xml:12248 @@ -10170,8 +10170,8 @@ msgstr "Nekaj redko uporabljenih nastavitev je možno nastaviti le s spreminjanj #. (para) #: ../source/TortoiseGit_en.xml:12337 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." -msgstr "Konfiguracijsko datoteko za Subversion lahko postavite na drugo lokacijo z uporabo naslednje lokacije v registru: HKCU\\Software\\TortoiseGit\\ConfigDir. Sprememba ima vpliv na vse operacije TortoiseGit." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgstr "Konfiguracijsko datoteko za Git lahko postavite na drugo lokacijo z uporabo naslednje lokacije v registru: HKCU\\Software\\TortoiseGit\\ConfigDir. Sprememba ima vpliv na vse operacije TortoiseGit." #. (term) #: ../source/TortoiseGit_en.xml:12346 @@ -10225,8 +10225,8 @@ msgstr "TortoiseGit omogoča uporabo zunanjega pregledovalnika razlik. Večina p #. (title) #: ../source/TortoiseGit_en.xml:12413 -msgid "Subversion Working Folders" -msgstr "Delovne mape Subversion" +msgid "Git Working Folders" +msgstr "Delovne mape Git" #. (primary) #: ../source/TortoiseGit_en.xml:12415 @@ -10240,8 +10240,8 @@ msgstr "_svn folder" #. (para) #: ../source/TortoiseGit_en.xml:12420 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." -msgstr "Ko VS.NET 2003 uporabljate za spletne projekte, ne more delati z mapami .svn, ki jih Subversion uporablja za shranjevanje notranjih informacij. To ni napaka sistema Subversion. To je napaka razvojnega okolja VS.NET 2003 in dodatkov za FrontPage, ki jih uporablja." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgstr "Ko VS.NET 2003 uporabljate za spletne projekte, ne more delati z mapami .svn, ki jih Git uporablja za shranjevanje notranjih informacij. To ni napaka sistema Git. To je napaka razvojnega okolja VS.NET 2003 in dodatkov za FrontPage, ki jih uporablja." #. (para) #: ../source/TortoiseGit_en.xml:12427 @@ -10250,8 +10250,8 @@ msgstr "Napaka je odpravljena v VS2005 in novejÅ¡ih različicah." #. (para) #: ../source/TortoiseGit_en.xml:12431 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." -msgstr "Od različice 1.3.0 sistemov Subversion in TortoiseGit naprej lahko nastavite okoljsko spremenljivko SVN_ASP_DOT_NET_HACK. Če je le-ta nastavljena, bo Subversion namesto map .svn uporabljal mape _svn. Da bi se sprememba okoljske spremenljivke upoÅ¡tevala, morate ponovno zagnati lupino. Običajno to pomeni ponoven zagon računalnika. Sedaj lahko to nastavitev opravite v oknu za nastavitve z uporabo preprostega potrditvenega polja - poglejte na ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgstr "Od različice 1.3.0 sistemov Git in TortoiseGit naprej lahko nastavite okoljsko spremenljivko SVN_ASP_DOT_NET_HACK. Če je le-ta nastavljena, bo Git namesto map .svn uporabljal mape _svn. Da bi se sprememba okoljske spremenljivke upoÅ¡tevala, morate ponovno zagnati lupino. Običajno to pomeni ponoven zagon računalnika. Sedaj lahko to nastavitev opravite v oknu za nastavitve z uporabo preprostega potrditvenega polja - poglejte na ." #. (para) #: ../source/TortoiseGit_en.xml:12441 @@ -10305,7 +10305,7 @@ msgstr "revizija v datoteki" #. (para) #: ../source/TortoiseGit_en.xml:12492 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." msgstr "SubWCRev je konzolna aplikacija, ki se uporablja za pridobivanje informacij o stanju delovne kopije z možnostjo zamenjave ključnih besed v predlogi. Postopek se pogosto uporablja kot del procesa gradnje projekta. S tem se v elemente projekta, ki se gradi, vnese informacije o delovni kopiji. Tipičen primer uporabe je prikaz Å¡tevilke revizije v pogovornem oknu O programu." #. (title) @@ -10315,7 +10315,7 @@ msgstr "Program SubWCRev za ukazno vrtico" #. (para) #: ../source/TortoiseGit_en.xml:12507 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." msgstr "SubWCRev prebere stanje vseh datotek v delovni kopiji, razen datotek zunanjih projektov (po privzetih nastavitvah). Zapomni si najviÅ¡jo najdeno Å¡tevilko revizije in časovni žig te revizije. Prav tako si zapomni, ali so v delovni kopiji narejene krajevne spremembe ali datoteke meÅ¡anih revizij. Na standardnem izhodu (stdout) se izpiÅ¡e Å¡tevilka revizije, območje posodobitve revizij in stanje sprememb." #. (para) @@ -10789,7 +10789,7 @@ msgstr "Zamenjano z naslovom URL skladišča poti delovne kopije, uporabljene pr #. (para) #: ../source/TortoiseGit_en.xml:12831 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " msgstr "Če morate do informacij o reviziji dostopati iz drugih programov, lahko uporabite vmesnik COM programa SubWCRev. Ustvariti morate objekt SubWCRev.object, na katerem so podprte naslednje metode: " #. (programlisting) @@ -10931,8 +10931,8 @@ msgstr "Pogosto zastavljena vpraÅ¡anja" #. (para) #: ../source/TortoiseGit_en.xml:12960 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "Ker se TortoiseGit nenehno razvija, je včasih težko vzdrževati dokumentacijo, tako da je ta vedno v skladu z aplikacijo. Vzdržujemo spletno stran z najpogosteje zastavljenimi vpraÅ¡anji, ki vsebujejo izbor vpraÅ¡anj, ki se najpogosteje pojavljajo na dopisnih seznamih projekta TortoiseGit dev@TortoiseGit.tigris.org in users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "Ker se TortoiseGit nenehno razvija, je včasih težko vzdrževati dokumentacijo, tako da je ta vedno v skladu z aplikacijo. Vzdržujemo spletno stran z najpogosteje zastavljenimi vpraÅ¡anji, ki vsebujejo izbor vpraÅ¡anj, ki se najpogosteje pojavljajo na dopisnih seznamih projekta TortoiseGit tortoisegit-dev@googlegroups.com in tortoisegit-users@googlegroups.com ." #. (para) #: ../source/TortoiseGit_en.xml:12972 @@ -10941,8 +10941,8 @@ msgstr "Vzdržujemo tudi users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." -msgstr "Če odgovora na svoje vpraÅ¡anje ne najdete nikjer drugje, uporabite naÅ¡e dopisne sezname. Naslov users@TortoiseGit.tigris.org uporabite v primeru vpraÅ¡anje glede uporabe programa TortoiseGit. Če želite sodelovati pri razvoju TortoiseGit, lahko sodelujete v debatah na naslovu dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." +msgstr "Če odgovora na svoje vpraÅ¡anje ne najdete nikjer drugje, uporabite naÅ¡e dopisne sezname. Naslov tortoisegit-users@googlegroups.com uporabite v primeru vpraÅ¡anje glede uporabe programa TortoiseGit. Če želite sodelovati pri razvoju TortoiseGit, lahko sodelujete v debatah na naslovu tortoisegit-dev@googlegroups.com ." #. (title) #: ../source/TortoiseGit_en.xml:12998 @@ -11001,8 +11001,8 @@ msgstr "pravzno sporočilo" #. (para) #: ../source/TortoiseGit_en.xml:13058 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." -msgstr "Obstajata dva načina, kako uporabnikom preprečiti objavljanje s praznim sporočilom dnevniÅ¡kega zapisa. Eden je poseben za TortoiseGit, drugi pa je uporaben za vse odjemalce Subversion, vendar morate za nastavitev imeti neposreden dostop do strežnika." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." +msgstr "Obstajata dva načina, kako uporabnikom preprečiti objavljanje s praznim sporočilom dnevniÅ¡kega zapisa. Eden je poseben za TortoiseGit, drugi pa je uporaben za vse odjemalce Git, vendar morate za nastavitev imeti neposreden dostop do strežnika." #. (title) #: ../source/TortoiseGit_en.xml:13064 @@ -11021,8 +11021,8 @@ msgstr "V mapi skladišča na strežniku se nahaja podmapa z imenom ho #. (para) #: ../source/TortoiseGit_en.xml:13080 -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." -msgstr "Ta metoda je priporočljiva, če uporabniki poleg TortoiseGit uporabljajo Å¡e druge odjemalce za Subversion. Slaba stran metode je, da objavo zavrne strežnik, zato bodo uporabniki dobili sporočilo o napaki. Odjemalec namreč ne more vnaprej vedeti, da bo objava zavrnjena. Če želite, da TortoiseGit onemogoči gumb V redu, dokler ni vneseno sporočilo dnevniÅ¡kega zapisa predpisane dolžine, uporabite metodo, ki je opisana spodaj." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgstr "Ta metoda je priporočljiva, če uporabniki poleg TortoiseGit uporabljajo Å¡e druge odjemalce za Git. Slaba stran metode je, da objavo zavrne strežnik, zato bodo uporabniki dobili sporočilo o napaki. Odjemalec namreč ne more vnaprej vedeti, da bo objava zavrnjena. Če želite, da TortoiseGit onemogoči gumb V redu, dokler ni vneseno sporočilo dnevniÅ¡kega zapisa predpisane dolžine, uporabite metodo, ki je opisana spodaj." #. (title) #: ../source/TortoiseGit_en.xml:13091 @@ -11168,8 +11168,8 @@ msgstr "Ker TortoiseGit nikoli ne izgubi podatkov, revizije, ki ste jih povrnili #. (para) #: ../source/TortoiseGit_en.xml:13281 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." -msgstr "Edini način, kako odstraniti podatke is skladišča, je z uporabo odjemalca za ukazno vrstico Subversion svnadmin. Kako postopek deluje, si lahko preberete na strani Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgstr "Edini način, kako odstraniti podatke is skladišča, je z uporabo odjemalca za ukazno vrstico Git svnadmin. Kako postopek deluje, si lahko preberete na strani Repository Maintenance." #. (title) #: ../source/TortoiseGit_en.xml:13292 @@ -11233,8 +11233,8 @@ msgstr "Mapi v projektu nastavite lastnost svn:externals. Ta #. (para) #: ../source/TortoiseGit_en.xml:13375 -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." -msgstr "Objavite novo mapo. Pri posodobitvi bo Subversion potegnil kopijo projekta iz skladišča v vaÅ¡o delovno kopijo. Če je to potrebno, se podmape ustvarijo samodejno. Ob vsaki posodobitvi delovne kopije boste posodobili tudi vse zunanje projekte." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgstr "Objavite novo mapo. Pri posodobitvi bo Git potegnil kopijo projekta iz skladišča v vaÅ¡o delovno kopijo. Če je to potrebno, se podmape ustvarijo samodejno. Ob vsaki posodobitvi delovne kopije boste posodobili tudi vse zunanje projekte." #. (para) #: ../source/TortoiseGit_en.xml:13394 @@ -11248,8 +11248,8 @@ msgstr "Uporabite vgnezdeno delovno kopijo" #. (para) #: ../source/TortoiseGit_en.xml:13403 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" -msgstr "Ustvarite novo mapo znotraj svojega projekta, ki naj vsebuje skupno kodo, vendar je ne dodajte v sistem Subversion." +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" +msgstr "Ustvarite novo mapo znotraj svojega projekta, ki naj vsebuje skupno kodo, vendar je ne dodajte v sistem Git." #. (para) #: ../source/TortoiseGit_en.xml:13407 @@ -11833,8 +11833,8 @@ msgstr "Ker je vse ukaze TortoiseGit možno krmiliti preko parameterov ukazne vr #. (para) #: ../source/TortoiseGit_en.xml:13910 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." -msgstr "UpoÅ¡tevajte, da je TortoiseGit odjemalec z grafičnim uporabniÅ¡kim vmesnikom, to poglavje pa vam pove, kako lahko prikažete okna programa TortoiseGit, tako da od uporabnika pridobite informacije. Če želite napisati ukazno datoteko, ki ne potrebuje vnosa s strani uporabnika, namesto TortoiseGit uporabite uradni odjemalec Subversion za ukazno vrstico." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." +msgstr "UpoÅ¡tevajte, da je TortoiseGit odjemalec z grafičnim uporabniÅ¡kim vmesnikom, to poglavje pa vam pove, kako lahko prikažete okna programa TortoiseGit, tako da od uporabnika pridobite informacije. Če želite napisati ukazno datoteko, ki ne potrebuje vnosa s strani uporabnika, namesto TortoiseGit uporabite uradni odjemalec Git za ukazno vrstico." #. (title) #. (title) @@ -12193,7 +12193,7 @@ msgstr "Odpre okno za nastavitve" #. (entry) #: ../source/TortoiseGit_en.xml:14188 msgid "Removes the file(s) in from version control." -msgstr "Odstrani datoteke v iz sistema Subversion." +msgstr "Odstrani datoteke v iz sistema Git." #. (entry) #: ../source/TortoiseGit_en.xml:14195 @@ -12455,18 +12455,18 @@ msgstr "CLI" #. (para) #: ../source/TortoiseGit_en.xml:14504 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." -msgstr "Ta priročnik vas včasih pozove, da pogledate dokumentacijo sistema Subversion, ki opisuje sistem Subversion z vidika uporabe preko ukazne vrstice (Command Line Interface - CLI). Da bi lažje razumeli, kaj se dogaja v ozadju, je tu seznam ukazov TortoiseGit in ekvivalentnih ukazov odjemalca za ukazno vrstico." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgstr "Ta priročnik vas včasih pozove, da pogledate dokumentacijo sistema Git, ki opisuje sistem Git z vidika uporabe preko ukazne vrstice (Command Line Interface - CLI). Da bi lažje razumeli, kaj se dogaja v ozadju, je tu seznam ukazov TortoiseGit in ekvivalentnih ukazov odjemalca za ukazno vrstico." #. (para) #: ../source/TortoiseGit_en.xml:14513 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." -msgstr "Čeprav za ukaze TortoiseGit obstajajo ekvivalentni ukazi v ukazni vrstici, ne pozabite, da TortoiseGit ukazne vrstice ne uporablja, ampak neposredno uporablja knjižnice sistema Subversion." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." +msgstr "Čeprav za ukaze TortoiseGit obstajajo ekvivalentni ukazi v ukazni vrstici, ne pozabite, da TortoiseGit ukazne vrstice ne uporablja, ampak neposredno uporablja knjižnice sistema Git." #. (para) #: ../source/TortoiseGit_en.xml:14519 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." -msgstr "Če mislite, da ste naÅ¡li napako v programu TortoiseGit, vas bomo mogoče prosili, da jo poskusite ponoviti z uporabo odjemalca ukazne vrstice za Subversion. S tem ločimo napake programa TortoiseGit od napak programa Subversion. Ta razpredelnica vam pove, katere ukaze poskusite." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." +msgstr "Če mislite, da ste naÅ¡li napako v programu TortoiseGit, vas bomo mogoče prosili, da jo poskusite ponoviti z uporabo odjemalca ukazne vrstice za Git. S tem ločimo napake programa TortoiseGit od napak programa Git. Ta razpredelnica vam pove, katere ukaze poskusite." #. (title) #: ../source/TortoiseGit_en.xml:14527 @@ -12529,8 +12529,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14577 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." -msgstr "Posodabljanje večjega Å¡tevila elementov v sistemu Subversion ni atomična operacija. TortoiseGit najprej najde revizijo HEAD v skladišču in potem posodobi vse elemente na to določeno Å¡tevilko revizije, da se izogne ustarjanju meÅ¡ane delovne kopije." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgstr "Posodabljanje večjega Å¡tevila elementov v sistemu Git ni atomična operacija. TortoiseGit najprej najde revizijo HEAD v skladišču in potem posodobi vse elemente na to določeno Å¡tevilko revizije, da se izogne ustarjanju meÅ¡ane delovne kopije." #. (para) #: ../source/TortoiseGit_en.xml:14584 @@ -12566,8 +12566,8 @@ msgstr "Če je potrjeno polje Posodobi le vrhnjo mapo, upor #. (para) #: ../source/TortoiseGit_en.xml:14612 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." -msgstr "V programu TortoiseGit pogovorno okno za objavo uporablja več ukazov sistema Subversion. Prvi ukaz je preverjanje stanja, ki v delovni kopiji najde elemente, ki so kandidati za objavo. Seznam lahko pregledate, pogledate spremembe datotek glede na revizijo BASE in izberete elemente, ki jih želite objaviti." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgstr "V programu TortoiseGit pogovorno okno za objavo uporablja več ukazov sistema Git. Prvi ukaz je preverjanje stanja, ki v delovni kopiji najde elemente, ki so kandidati za objavo. Seznam lahko pregledate, pogledate spremembe datotek glede na revizijo BASE in izberete elemente, ki jih želite objaviti." #. (screen) #. (screen) @@ -12587,8 +12587,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14622 #: ../source/TortoiseGit_en.xml:14710 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." -msgstr "Če je potrjena možnost Prikaži datoteke brez različic, bo TortoiseGit prikazal vse datoteke in mape brez različic v hierarhiji delovne kopije, pri tem pa upoÅ¡teval pravila za prezrte elemente. Ta zmožnost nima neposrednega ekvivalentnega ukaza v sistemu Subversion, ker se ukaz svn status ne ukvarja z datotekami brez različic." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." +msgstr "Če je potrjena možnost Prikaži datoteke brez različic, bo TortoiseGit prikazal vse datoteke in mape brez različic v hierarhiji delovne kopije, pri tem pa upoÅ¡teval pravila za prezrte elemente. Ta zmožnost nima neposrednega ekvivalentnega ukaza v sistemu Git, ker se ukaz svn status ne ukvarja z datotekami brez različic." #. (para) #: ../source/TortoiseGit_en.xml:14630 @@ -12609,7 +12609,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14637 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." msgstr "Ko kliknete na gumb V redu, se spremembe objavijo. Če ste pustili vsa potrditvena polja za izbiro datotek v privzetem stanju, TortoiseGit uporabi enojno rekurzivno objavo delovne kopije. Če nekatere datoteke izločite, mora uporabiti nerekurzivno objavo (-N). Vsaka pot mora biti posamično navedena v ukazni vrstici ob objavi." #. (screen) @@ -12796,7 +12796,7 @@ msgstr "Prva faza predstavlja preverjanje stanja, s čemer ugotovimo, katere ele #. (para) #: ../source/TortoiseGit_en.xml:14790 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." msgstr "Ko kliknete na gumb V redu, se zgodi povrnitev. Če izbire niste spreminjali, uporabi TortoiseGit eno samo rekurzivno (-R) povrnitev delovne kopije. Če ste izklopili nekatere datoteke, potem mora pri uporabi ukaza v ukazni vrstici podati vsako pot posebej. " #. (screen) @@ -12951,8 +12951,8 @@ msgstr "Ta oblika se uporablja v mapi brez različic, kadar je ta mapa tudi cilj #. (para) #: ../source/TortoiseGit_en.xml:14892 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." -msgstr "Izvoz delovne kopije na drugo lokacijo se ne izvede s pomočjo knjižnice Subversion, zato ekvivalentnega ukaza ni." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." +msgstr "Izvoz delovne kopije na drugo lokacijo se ne izvede s pomočjo knjižnice Git, zato ekvivalentnega ukaza ni." #. (para) #: ../source/TortoiseGit_en.xml:14897 @@ -13066,8 +13066,8 @@ msgstr "TortoiseGit ustvari datoteko popravkov v obliki poenotene razlike s prim #. (para) #: ../source/TortoiseGit_en.xml:14980 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." -msgstr "Nameščanje datotek popravkov je zahtevno opravilo, razen če imata datoteka popravkov in delovna kopija isto Å¡tevilko revizije. Na srečo lahko uporabite orodje TortoiseMerge, ki nima ekvivalentnega orodja v sistemu Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." +msgstr "Nameščanje datotek popravkov je zahtevno opravilo, razen če imata datoteka popravkov in delovna kopija isto Å¡tevilko revizije. Na srečo lahko uporabite orodje TortoiseMerge, ki nima ekvivalentnega orodja v sistemu Git." #. (title) #: ../source/TortoiseGit_en.xml:14994 @@ -13086,8 +13086,8 @@ msgstr "prioriteta prekrivnih ikon" #. (para) #: ../source/TortoiseGit_en.xml:15009 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." -msgstr "Vsaka datoteka in mapa pod nadzorom ima v sistemu Subversion stanje, ki ga sporoči knjižnica Subversion. V odjemalcu za ukazno vrstico je status prikazan z črko, v programu TortoiseGit pa je prikazan grafično s prekrivnimi ikonami. Ker je Å¡tevilo prekrivnih ikon zelo omejeno, lahko vsaka ikona predstavlja več vrednosti stanja." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgstr "Vsaka datoteka in mapa pod nadzorom ima v sistemu Git stanje, ki ga sporoči knjižnica Git. V odjemalcu za ukazno vrstico je status prikazan z črko, v programu TortoiseGit pa je prikazan grafično s prekrivnimi ikonami. Ker je Å¡tevilo prekrivnih ikon zelo omejeno, lahko vsaka ikona predstavlja več vrednosti stanja." #. (para) #: ../source/TortoiseGit_en.xml:15017 @@ -13111,13 +13111,13 @@ msgstr " Prekrivna ikona d #. (para) #: ../source/TortoiseGit_en.xml:15051 -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." -msgstr " Prekrivna ikona V sistemu Subversion predstavlja običajno stanje ali element pod nadzorom, katerega stanje Å¡e ni znano. Ker TortoiseGit uporablja poseben proces za predpomnenje stanja, lahko traja nekaj sekund, preden se prekrivna ikona posodobi." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgstr " Prekrivna ikona V sistemu Git predstavlja običajno stanje ali element pod nadzorom, katerega stanje Å¡e ni znano. Ker TortoiseGit uporablja poseben proces za predpomnenje stanja, lahko traja nekaj sekund, preden se prekrivna ikona posodobi." #. (para) #: ../source/TortoiseGit_en.xml:15060 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." -msgstr " Prekrivna ikona Potrebuje zaklep se uporablja za datoteke, ki imajo nastavljeno lastnost svn:needs-lock. Za delovne kopije, ustvarjene z različico Subversion 1.4.0 ali novejÅ¡o, je stanje svn:needs-lock predpomnjeno krajevno in se uporablja tudi za prikaz prekrivne ikone. Za delovne kopije, ustvarjene z različico 1.4.x ali starejÅ¡o TortoiseGit prikaže to ikono v primeru datoteke, ki je namenjena samo za branje. UpoÅ¡tevajte, da Subversion samodejno nadgradi delovne kopije, ko jih posodobite. Predpomnenje lastnosti svn:needs-lock se morda ne bo zgodilo, dokler ne boste posodobili datoteke." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgstr " Prekrivna ikona Potrebuje zaklep se uporablja za datoteke, ki imajo nastavljeno lastnost svn:needs-lock. Za delovne kopije, ustvarjene z različico Git 1.4.0 ali novejÅ¡o, je stanje svn:needs-lock predpomnjeno krajevno in se uporablja tudi za prikaz prekrivne ikone. Za delovne kopije, ustvarjene z različico 1.4.x ali starejÅ¡o TortoiseGit prikaže to ikono v primeru datoteke, ki je namenjena samo za branje. UpoÅ¡tevajte, da Git samodejno nadgradi delovne kopije, ko jih posodobite. Predpomnenje lastnosti svn:needs-lock se morda ne bo zgodilo, dokler ne boste posodobili datoteke." #. (para) #: ../source/TortoiseGit_en.xml:15074 @@ -13136,13 +13136,13 @@ msgstr " Ta ikona se uporablja #. (para) #: ../source/TortoiseGit_en.xml:15095 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "Če je stanje elementa brez stanja (element se ne nahaja v delovni kopiji), prekrivna ikona ni prikazana. Če ste izključili prikaz prekrivnih ikon za prezrte elemente in elemente brez različic, potem prekrivne ikone ne bodo prikazane tudi za te elemente." #. (para) #: ../source/TortoiseGit_en.xml:15102 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." -msgstr "Element ima lahko le eno stanje sistema Subversion. Primer: datoteka je krajevno spremenjena in hkrati označena za brisanje. Subversion vrne eno samo stanje - v tem primeru izbrisano. Prioritete stanj definira Subversion." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." +msgstr "Element ima lahko le eno stanje sistema Git. Primer: datoteka je krajevno spremenjena in hkrati označena za brisanje. Git vrne eno samo stanje - v tem primeru izbrisano. Prioritete stanj definira Git." #. (para) #: ../source/TortoiseGit_en.xml:15109 @@ -13186,23 +13186,23 @@ msgstr "Zavarovanje strežnika Svnserve z SSL" #. (para) #: ../source/TortoiseGit_en.xml:15172 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." -msgstr "V tem razdelku so opisani koraki, ki jih je potrebno izvesti, če želite pri sistemu Subversion in TortoiseGit uporabljati protokol svn+ssh. Če za dostop do strežnika Subversion in avtentikacijo že uporabljate SSH, potem tega ne potrebujete; kaj več o tem si lahko preberete v knjigi The Subversion Book. Če Å¡e ne uporabljate SSH in želite svoj sistem Subversion zaščititi, vam ta razdelek ponuja enostaven način, kako to storite, ne da bi morali za vsakega uporabnika sistema Subversion ustvariti tudi račun SSH na strežniku." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." +msgstr "V tem razdelku so opisani koraki, ki jih je potrebno izvesti, če želite pri sistemu Git in TortoiseGit uporabljati protokol svn+ssh. Če za dostop do strežnika Git in avtentikacijo že uporabljate SSH, potem tega ne potrebujete; kaj več o tem si lahko preberete v knjigi The Git Book. Če Å¡e ne uporabljate SSH in želite svoj sistem Git zaščititi, vam ta razdelek ponuja enostaven način, kako to storite, ne da bi morali za vsakega uporabnika sistema Git ustvariti tudi račun SSH na strežniku." #. (para) #: ../source/TortoiseGit_en.xml:15182 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." -msgstr "Pri tem načinu ustvarimo en račun SSH za vse uporabnike sistema Subversion in uporabimo različne ključe za avtentikacijo, da ločimo med posameznimi uporabniki sistema Subversion." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." +msgstr "Pri tem načinu ustvarimo en račun SSH za vse uporabnike sistema Git in uporabimo različne ključe za avtentikacijo, da ločimo med posameznimi uporabniki sistema Git." #. (para) #: ../source/TortoiseGit_en.xml:15187 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "V tem dodatku predpostavljamo, da imate nameščena vsa potrebna orodja in ustvarjeno skladišče, kot je opisano v predhodnjih poglavjih. Pri uporabi SSH strežnika svnserve ne smete poganjati kot storitev ali prikriti process." #. (para) #: ../source/TortoiseGit_en.xml:15193 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" -msgstr "Veliko informacij smo povzeli po učbeniku Marca Logemanna, ki ga najdete na povezavi www.logemann.org Dodatne informacije v zvezi s postavitvijo strežnika v sistemu Windows je podal Thorsten Müller. Hvala obema!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgstr "Veliko informacij smo povzeli po učbeniku Marca Logemanna, ki ga najdete na povezavi www.logemann.org Dodatne informacije v zvezi s postavitvijo strežnika v sistemu Windows je podal Thorsten Müller. Hvala obema!" #. (title) #: ../source/TortoiseGit_en.xml:15204 @@ -13222,8 +13222,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15214 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." -msgstr "Če zgradite Subversion sami iz izvorne kode in ne podate parametra v ./configure, Subversion ustvari podmapo bin v mapi /usr/local in tja shrani binarne datoteke. Če želite uporabiti tunelski način s SSH, se morate zavedati, da prijava uporabnika preko SSH zahteva izvržbo programa svnserve in Å¡e nekaterih knjižnic. Zato dodajte mapo /usr/local/bin v okoljsko spremenljivko PATH ali ustvarite simbolično povezavo binarnih datotek v mapo /usr/sbin ali katerokoli mapo, ki se nahaja v okoljski spremenljivki PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgstr "Če zgradite Git sami iz izvorne kode in ne podate parametra v ./configure, Git ustvari podmapo bin v mapi /usr/local in tja shrani binarne datoteke. Če želite uporabiti tunelski način s SSH, se morate zavedati, da prijava uporabnika preko SSH zahteva izvržbo programa svnserve in Å¡e nekaterih knjižnic. Zato dodajte mapo /usr/local/bin v okoljsko spremenljivko PATH ali ustvarite simbolično povezavo binarnih datotek v mapo /usr/sbin ali katerokoli mapo, ki se nahaja v okoljski spremenljivki PATH." #. (para) #: ../source/TortoiseGit_en.xml:15227 @@ -13243,7 +13243,7 @@ msgid "" "useradd -m svnuser\n" " Be sure to give this user full access rights to the repository." msgstr "" -"Ustvarite novega uporabnika, ki bo imel dostop do skladišča Subversion: \n" +"Ustvarite novega uporabnika, ki bo imel dostop do skladišča Git: \n" "useradd -m svnuporabnik\n" " Uporabniku dajte popoln dostop do skladišča." @@ -13384,8 +13384,8 @@ msgstr "PreizkuÅ¡anje SSH s TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:15377 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." -msgstr "Preverili smo le, če se lahko prijavite preko SSH. Sedaj moramo zagotoviti, da ta povezava lahko poganja svnserve. Na strežniku spremenite datoteko /home/svnuser/.ssh/authorized_keys, kot je navedeno spodaj. S tem omogočite, da več uporabnikov sistema Subversion istočasno uporablja isti sistemski račun, svnuporabnik. UpoÅ¡tevajte, da vsak uporabnik sistema Subversion uporablja iste podatke za prijavo, vendar ima drugačen avtentikacijski ključ, zato morate dodati za vsakega uporabnika eno vrstico." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." +msgstr "Preverili smo le, če se lahko prijavite preko SSH. Sedaj moramo zagotoviti, da ta povezava lahko poganja svnserve. Na strežniku spremenite datoteko /home/svnuser/.ssh/authorized_keys, kot je navedeno spodaj. S tem omogočite, da več uporabnikov sistema Git istočasno uporablja isti sistemski račun, svnuporabnik. UpoÅ¡tevajte, da vsak uporabnik sistema Git uporablja iste podatke za prijavo, vendar ima drugačen avtentikacijski ključ, zato morate dodati za vsakega uporabnika eno vrstico." #. (para) #: ../source/TortoiseGit_en.xml:15386 @@ -13420,7 +13420,7 @@ msgstr "<PublicKey> je potrebno nadomestiti z javnim kl #. (para) #: ../source/TortoiseGit_en.xml:15413 msgid "<Comment> can be any comment you like, but it is useful for mapping an svn author name to the person's real name." -msgstr "<Comment> je lahko poljuben komentar, vendar je na tem mestu priporočljivo zapisati uporabniÅ¡ko ime v sistemu Subversion in pravo ime uporabnika." +msgstr "<Comment> je lahko poljuben komentar, vendar je na tem mestu priporočljivo zapisati uporabniÅ¡ko ime v sistemu Git in pravo ime uporabnika." #. (para) #: ../source/TortoiseGit_en.xml:15417 @@ -13499,8 +13499,8 @@ msgstr "Slovar" #. (para) #: ../source/TortoiseGit_en.xml:15523 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "Ukaz Subversion, ki se uporablja za dodajanje datoteke ali mape v delovno kopijo. Novi elementi so dodani v skladišče, ko naredite objavo." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "Ukaz Git, ki se uporablja za dodajanje datoteke ali mape v delovno kopijo. Novi elementi so dodani v skladišče, ko naredite objavo." #. (glossterm) #: ../source/TortoiseGit_en.xml:15531 @@ -13534,23 +13534,23 @@ msgstr "Veja" #. (para) #: ../source/TortoiseGit_en.xml:15565 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "Ta izraz, ki se pri nadzoru različic pogosto uporablja, opisuje, kaj se zgodi, ko se razvoj prelomi v določeni točki in se nadaljuje v dveh smereh. Iz glavne veje lahko ustvarite vejo, da razvijate novo zmožnost programa, ne da bi naredili glavno vejo nestabilno. Lahko pa naredite vejo iz stabilne verzije programa, da naredite popravke, razvoj pa se nadaljuje na nestabilni veji. V sistemu Subversion so veje izvedene kot poceni kopije." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." +msgstr "Ta izraz, ki se pri nadzoru različic pogosto uporablja, opisuje, kaj se zgodi, ko se razvoj prelomi v določeni točki in se nadaljuje v dveh smereh. Iz glavne veje lahko ustvarite vejo, da razvijate novo zmožnost programa, ne da bi naredili glavno vejo nestabilno. Lahko pa naredite vejo iz stabilne verzije programa, da naredite popravke, razvoj pa se nadaljuje na nestabilni veji. V sistemu Git so veje izvedene kot poceni kopije." #. (para) #: ../source/TortoiseGit_en.xml:15580 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "Ukaz, ki ustvari krajevno delovno kopijo v prazni mapi in prenese datoteke pod nadzorom iz skladišča." #. (para) #: ../source/TortoiseGit_en.xml:15589 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "Citat iz knjige The Subversion Book: Rekurzivno počisti delovno kopijo, tako da odstrani zaklepe in zaključi nedokončane operacije. Če se vam kdaj prikaže sporočilo delovna kopija zaklenjena, poženite ta ukaz, da ostranite zaklepe in naredite delovno kopijo spet uporabno. UpoÅ¡tevajte, da v tem kontekstu zaklep pomeni zaklepanje datotečnega sistema in ne zaklepanje skladišča." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "Citat iz knjige The Git Book: Rekurzivno počisti delovno kopijo, tako da odstrani zaklepe in zaključi nedokončane operacije. Če se vam kdaj prikaže sporočilo delovna kopija zaklenjena, poženite ta ukaz, da ostranite zaklepe in naredite delovno kopijo spet uporabno. UpoÅ¡tevajte, da v tem kontekstu zaklep pomeni zaklepanje datotečnega sistema in ne zaklepanje skladišča." #. (para) #: ../source/TortoiseGit_en.xml:15606 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "Ta ukaz sistema Subversion se uporablja za poÅ¡iljanje sprememb v delovni kopiji nazaj na skladišče. S tem se tam ustvari nova revizija." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "Ta ukaz sistema Git se uporablja za poÅ¡iljanje sprememb v delovni kopiji nazaj na skladišče. S tem se tam ustvari nova revizija." #. (glossterm) #: ../source/TortoiseGit_en.xml:15614 @@ -13559,8 +13559,8 @@ msgstr "Spor" #. (para) #: ../source/TortoiseGit_en.xml:15616 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "Ko spremembe iz skladišča spojimo s krajevnimi spremembami, se včasih spremembe zgodijo na isti vrstici. V takÅ¡nem primeru se Subversion ne more sam odločiti, katero različico naj uporabi in datoteka je v spornem stanju. Pred objavo morate datoteko ročno urediti in reÅ¡iti spor." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "Ko spremembe iz skladišča spojimo s krajevnimi spremembami, se včasih spremembe zgodijo na isti vrstici. V takÅ¡nem primeru se Git ne more sam odločiti, katero različico naj uporabi in datoteka je v spornem stanju. Pred objavo morate datoteko ročno urediti in reÅ¡iti spor." #. (glossterm) #: ../source/TortoiseGit_en.xml:15626 @@ -13569,8 +13569,8 @@ msgstr "Kopiraj" #. (para) #: ../source/TortoiseGit_en.xml:15628 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "V skladišču Subversion lahko naredite kopijo datoteke ali celotnega drevesa. Kopije so izvedene kot poceni kopije, kar je nekaj podobnega kot povezava na originalen element in ne zavzema skoraj nič prostora. Kopija ohrani zgodovino originala, tako da lahko vedno pogledate spremembe, ki so bile narejene preden se je element prekopiral." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "V skladišču Git lahko naredite kopijo datoteke ali celotnega drevesa. Kopije so izvedene kot poceni kopije, kar je nekaj podobnega kot povezava na originalen element in ne zavzema skoraj nič prostora. Kopija ohrani zgodovino originala, tako da lahko vedno pogledate spremembe, ki so bile narejene preden se je element prekopiral." #. (para) #: ../source/TortoiseGit_en.xml:15640 @@ -13594,8 +13594,8 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15671 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "Ekskluziven datotečni sistem za skladišča sistema Subversion. Uporablja se lahko tudi v omrežnih datotekah v skupni rabi. Privzet sistem pri različicah 1.2 in novejÅ¡ih." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "Ekskluziven datotečni sistem za skladišča sistema Git. Uporablja se lahko tudi v omrežnih datotekah v skupni rabi. Privzet sistem pri različicah 1.2 in novejÅ¡ih." #. (para) #: ../source/TortoiseGit_en.xml:15680 @@ -13614,8 +13614,8 @@ msgstr "NajnovejÅ¡a revizija datoteke ali mape v skladiščuPatch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "Če so se v delovni kopiji spremenile le besedilne datoteke, je možno z ukazom Razlikuj ustvariti datoteko s povzetkom sprememb v obliki poenotene razlike (unified diff). Datoteka takÅ¡nega tipa se pogosto imenuje popravek in se lahko uporablja za poÅ¡iljanje sprememb po elektronski poÅ¡ti vaÅ¡emu sodelavcu ali dopisnemu seznamu. Ta datoteka se potem uporabi na neki drugi delovni kopiji. Nekdo, ki nima pravic pisanja po skladišču, lahko naredi spremembe in ustvari popravek, ki ga objavi nek drug uporabnik, ki ustrezne pravice ima. Ali pa če niste prepričani, da so vaÅ¡e spremembe dobre, lahko na ta način drugim uporabnikom poÅ¡ljete spremembe v pregled." #. (glossterm) @@ -13669,8 +13669,8 @@ msgstr "Lastnost" #. (para) #: ../source/TortoiseGit_en.xml:15764 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "Poleg vodenja različic map in datotek Subversion omogoča tudi vodenje različic meta podatkov - rečemo jim lastnosti - za vsak element pod nadzorom. Vsaka lastnost ima ime in vrednost, podobno kot register. Subversion interno uporablja nekaj posebnih lastnosti, n. pr. svn:eol-style. Tudi TortoiseGit uporablja nekaj internih lastnosti, n. pr. tsvn:logminsize. Lahko pa dodate svoje lastnosti s poljubnim imenom in vrednostjo." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "Poleg vodenja različic map in datotek Git omogoča tudi vodenje različic meta podatkov - rečemo jim lastnosti - za vsak element pod nadzorom. Vsaka lastnost ima ime in vrednost, podobno kot register. Git interno uporablja nekaj posebnih lastnosti, n. pr. svn:eol-style. Tudi TortoiseGit uporablja nekaj internih lastnosti, n. pr. tsvn:logminsize. Lahko pa dodate svoje lastnosti s poljubnim imenom in vrednostjo." #. (para) #: ../source/TortoiseGit_en.xml:15779 @@ -13699,8 +13699,8 @@ msgstr "Ko so datoteke v delovni kopiji sporne (zaradi spajanja), mora uporabnik #. (para) #: ../source/TortoiseGit_en.xml:15819 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion hrani krajevno izvirno kopijo vsake datoteke, kakrÅ¡na je bila ob zadnji posodobitvi. Če ste na datoteki naredili spremembe in jih želite povrniti, uporabite ukaz povrni, da dobite nazaj izvirno datoteko." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Git hrani krajevno izvirno kopijo vsake datoteke, kakrÅ¡na je bila ob zadnji posodobitvi. Če ste na datoteki naredili spremembe in jih želite povrniti, uporabite ukaz povrni, da dobite nazaj izvirno datoteko." #. (glossterm) #: ../source/TortoiseGit_en.xml:15828 @@ -13734,13 +13734,13 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:15860 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Pogosto uporabljena okrajÅ¡ava za Subversion." +msgid "A frequently-used abbreviation for Git." +msgstr "Pogosto uporabljena okrajÅ¡ava za Git." #. (para) #: ../source/TortoiseGit_en.xml:15863 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Ime lastnega protokola sistema Subversion, ki ga uporablja strežnik skladišč svnserve." +msgid "The name of the Git custom protocol used by the svnserve repository server." +msgstr "Ime lastnega protokola sistema Git, ki ga uporablja strežnik skladišč svnserve." #. (para) #: ../source/TortoiseGit_en.xml:15872 @@ -13749,7 +13749,7 @@ msgstr "Prav tako kot ukaz posodobi-na-revizijo spremeni časovno #. (para) #: ../source/TortoiseGit_en.xml:15886 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "Ta ukaz prenese vse zadnje spremembe iz skladišča v delovno kopijo, pri tem pa spoji spremebe, ki so jih naredili ostali uporabniki, z vaÅ¡imi spremembami v delovni kopiji." #. (glossterm) diff --git a/doc/po/TortoiseSVN_sr_spc.po b/doc/po/TortoiseSVN_sr_spc.po index 7265ae2..13b50c7 100644 --- a/doc/po/TortoiseSVN_sr_spc.po +++ b/doc/po/TortoiseSVN_sr_spc.po @@ -18,7 +18,7 @@ msgstr "" "POT-Creation-Date: 2009-01-12 08:46 +0000\n" "PO-Revision-Date: 2009-01-21 20:08+0100\n" "Last-Translator: Milorad Popović\n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,7 +41,7 @@ msgstr "ТортоисеСВН" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" +msgid "A Git client for Windows" msgstr "Субверзиони клијент за Виндоуз" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated @@ -122,7 +122,7 @@ msgstr "Аудиторијум" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." msgstr "Ова књига је написана за познаваоце компјутера који желе да користе Субверзију да управљају својим подацима, а није им згодно да користе програме који то раде из командне линије. Како је ТортоисеСВН проширење виндоуз шкољке узима се да је корисник упознат са виндоуз претраживачем и зна како га користити." #. (title) @@ -142,17 +142,17 @@ msgstr " објашњава шта је Т #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." msgstr "У дали смо кратак увод у Субверзија ревизиони контролни систем који покрива ТортоисеСВН. Ово је позајмљено из документације за пројекат Субверзије и објашњава резличите приступе контроли верзија, и како Субверзија ради." #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." msgstr "Већина Корисника Субверзије неће никада сами подешавати сервер. Следеће поглавље се бави поступком подешавања сервера и корисно је за администраторе. " #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." msgstr "Поглавље објашњава како подесити локално спремиште, које је корисно за тестирање Субверзије и ТортоисеСВН користећи један ПЦ. Оно такође објашњава нешто мало о администрирању спремишта што је релевантно за спремишта лоцирана на серверу." #. (para) @@ -177,7 +177,7 @@ msgstr "Део приказује како #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." msgstr " даје корелацију између ТортоисеСВН команди и њихових еквивалената у Субверзија клијента командне линије свн.еxе." #. (title) @@ -202,7 +202,7 @@ msgstr "Заједница" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." msgstr "И ТортоисеСВН и Субверзија су развијени од заједнице људи који раде на тим пројектима. Они долазе из разних земаља из целог света и удружују се да заједно направе изванредне програме." #. (title) @@ -252,12 +252,12 @@ msgstr "за помагање у документацији и тражењу б #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" +msgid "The Git Book" msgstr "Књига Субверзија" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" +msgid "for the great introduction to Git and its chapter 2 which we copied here" msgstr "за велики увод у Субверзију и поглавље 2 које смо копирали овде" #. (term) @@ -371,12 +371,12 @@ msgstr "Шта је ТортоисеСВН?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." msgstr "ТортоисеСВН је беплатан клијент отвореног кода за Субверзиони систем контроле верзија. Дакле, ТортоисеСВН управља фајловима и именицима прековремено. Фајлови су смештени у централном спремишту. Спремиште је у многоме као прави фајл сервер, осим што памти сваку промену икада направљену на вашим фајловима и именицима. Ово вам дозвољава да позовете старе верзије ваших фајлова и проучите историју како и када су подаци промењени, и ко их је променио. Због тога многи људи о Субверзији и системима контроле верзија уопштено мисле да су то временске машине." #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." msgstr "Неки системи контроле верзија су такође софтвер системи управљања конфигурацијом (СУК). Ови системи су специјално приагођени да управљају стабла изворног кода, и имају многе особине специфичне за развој софтвера - као што је природно разумевање програмских језика, или снабдевањем алатима за израду софтвера. Субверзија, међутим, није један од тих система; она је општи систем који се може користити да управља сваки скуп фајлова, обухватајући и изворни код." #. (title) @@ -386,17 +386,17 @@ msgstr "ТортоисеСВН историја" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." msgstr "У 2002 Тим Кемп је нашао да је Субверзија била јако добар систем контроле верзија, али је недостајао добар ГУИ клијент. Идеја за Сбверзиони клијент као Виндоуз интегрисану шкољку инспирисана је сличним клијентом за ЦВС именом ТортоисеЦВС." #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." msgstr "Тим је проучио изворни код ТортоисеЦВС и искористио га као основу за ТортоисеСВН. Он је затим започео са пројектом, региструјући домен тортоисесвн.орг и ставио је изворни код онлајн. У то време, Стефан Кинг је тражио добар и бесплатан систем контроле верзија и нашао Субверзију и изворни код за ТортоисеСВН. Пошто ТортоисеСВН још није био спреман за коришћење он се придружио пројекту и почео да програмира. Ускоро је преписао већину постојећег кода и почео да додаје команде и могућности, све до тачке где ништа од оригиналног кода није остало. " #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." msgstr "Што је Субверзија постајала стабилнија привлачила је све више корисника који су почели да користе ТортоисеСВН као Субверзиони клијент. Корисничка основа расте брзо (и још увек расте сваки дан). То је од кад је Лубе Онкен понудио да помогне са лепим иконама и логом за ТортоисеСВН. Он води бригу о вебсајту и управља преводима." #. (title) @@ -406,7 +406,7 @@ msgstr "ТортоисеСВН особине" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." msgstr "Шта чини ТортоисеСВН тако добрим Субверзионим клијентом? Овде је кратка листа особина." #. (term) @@ -446,17 +446,17 @@ msgstr "Статус сваког верзионисаног фајла и им #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" +msgid "Easy access to Git commands" msgstr "Лак приступ Субверзионим командама." #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." msgstr "Све Субверзионе команде су доступне из експлореровог контекстног менија. ТортоисеСВН додаје свој субмени онде." #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" msgstr "Како је ТортоисеСВН Субверзиони клијент, ми бисмо волели да прикажемо неке особине саме Субверзије:" #. (term) @@ -466,7 +466,7 @@ msgstr "Верзионисање именика" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." msgstr "ЦВС прати само историју индивидуалних фајлова, док Субверзија имплементиравиртуални верзионисани фајлсистем који бележи промене целог стабла именика прековремено. Фајлови и именици су верзионисани. Као резилтат, постоји права клијент-страна премести и копирај команде које раде на фајловима и именицима." #. (term) @@ -496,7 +496,7 @@ msgstr "Избор мрежних слојева" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." msgstr "Субверзија има апстрактну идеју приступа спремишту, чинећи га лаким да људи инплементирај у нове мрежне механизме.Субверзиони напредни мрежни серверје модул за апач веб сервер, који говори варијанту ХТТП звану ВебДАВ/ДелтаВ. То даје Субверзији велику предност у стабилности и оператибилности, и омогућава разне кључне особине бесплатно: аутентикацију, ауторизацију, цомпресију, и претраживање спремишта, на пример.Мали, самостални Субверзиони сервер процес је такође доступан. Овај сервер говори уопбичајени протокол који може бити лако провучен кроз ссх." #. (term) @@ -506,7 +506,7 @@ msgstr "Складно руковање подацима" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." msgstr "Субверзија излаже фајл разлике користећи бинарни диференцијални алгоритам, који ради идентично на текст (људски читљивим) и бинарним (људски нечитљивим) фајловима. Оба типа фајлова су смештена једнако компримовани у спремишту, и разлике су пренете у оба смера кроз мрежу." #. (term) @@ -516,7 +516,7 @@ msgstr "Ефикасно гранање и означавање" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." msgstr "Цена гранања и означавања не треба да буде пропорционално величини пројекта. Субверзија ствара гране и значке једноставним копирањем пројекта, користећи механизам сличан чврстим линковима. Зато ове операције узимају веома мали, константан износ времена, и веома мали простор у спремишту." #. (term) @@ -526,7 +526,7 @@ msgstr "Хакерабилити" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." msgstr "Субверзија нема истријски пртљаг; она је имплементирана као колекција дељивих Ц библиотека са добро дефинисаним АПИјем. То чини Субверзију екстремно подржавајућом и искористивом од других апликација и језика." #. (title) @@ -671,22 +671,22 @@ msgstr "Основни концепт" #. (primary) #: ../source/TortoiseGit_en.xml:725 -msgid "Subversion book" +msgid "Git book" msgstr "Субверзиона књига" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." msgstr "Ово поглавље је мало измењена верзија истог поглавља у Субверзионој књизи. Онлајн верзија Субверзионе књиге је доступна овде:http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." msgstr "Ово поглавље је кратак, необавезан увод у Субверзију. Ако сте нови у контроли верзија, ово поглавље је сигурно за вас. Почињемо дискусијом о општем концепту контроле верзија, рад нас води у специфичне идеје унутар Субверзије, и приказује неке једноставне примере Субверзије при коришћењу." #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." msgstr "Упркос томе што примери у овом поглављу приказују људске дељиве колекције изворног кода програма, имајте на уму да Субверзија може управљати било којом врстом колекције фајлова - није ограничена на помоћ компутерским програмерима." #. (title) @@ -707,7 +707,7 @@ msgstr "спремиште" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." msgstr "Субверзија је централизован систем за дељење информција. У сржи је спремиште, које је централно стовариште података. Спремиште смешта информације у облику фајлсистем стабла - типична хијерархија фајлова и именика. Било који број клијената спаја се на спремиште и чита или уписује у те фајлове. Уписивањем података клијент омогућава да информација буде доступна другима; читањем података клијент прима информације од других." #. (title) @@ -717,7 +717,7 @@ msgstr "Типични клијент/сервер систем" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." msgstr "Дакле зашто је ово интересантно? Зато што је песма од дефиниције типичног фајл сервера. И свакако, спремиште је врста фајл сервера, али није то ваш уобичајен сој. Шта чини Субверзионо спремиште специјалним је да оно памти све измене икад уписане у њега: све измене сваког фајла, и чак измене самог стабла именика, као што је додавање, брисање, и преуређење фајлова у именика." #. (para) @@ -791,7 +791,7 @@ msgstr "Копирај-Мењај-Стопи решење" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." msgstr "Субверзија, ЦВС и други системи контроле верзија користе копирај-мењај-стопи модел као алтернативу закључавању. У овом моделу сваки кориснички клијент чита спремиште и креира личну радну копију фајла или пројекта. Корисници онда раде паралелно, мењајући своје приватне копије. Финално, приватне копије се спајају у нову, финалну верзију. Систем контроле верзија често посредује у спајању, али људи су одговорни да учине да све буде коректно." #. (para) @@ -833,17 +833,17 @@ msgstr "Постоји једна обична ситуација где зак #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" +msgid "What does Git Do?" msgstr "Шта Субверзија ради?" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." msgstr "Субверзија користи копирај-измени-стопи решење уобичајено, и у многим случајевимаово је све што вам је потребно. Међутим, од Верзије 1.2 Субверзија такође подржава закључавање фајлова, тако да ако имате нестопиве фајлове, или ако једноставно форсирате политику закључавања преко управе, Субверзија ће још омогућавати жељене особине." #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" +msgid "Git in Action" msgstr "Субверзија у акција" #. (title) @@ -858,27 +858,27 @@ msgstr "радна копија" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." msgstr "Већ сте читали о радној копији; сада ћемо демонстрирати како је Субверзиони клијент креира и користи. " #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." msgstr "Субверзиона радна копија је обично стабло именика у вашем локалном систему, које садржи колекцију фајлова. Ви можете уредити ове фајлове како желите, и ако су фајлови изворног кода, можете компајлирати ваш програм од њих на уобичајен начин. Ваша радна копија је ваша лична приватна радна површина: Субверзија неће инкорпорирати измене других људи, нити ће урадити ваше промене доступне другима, све док јој експлицитно не кажете да то уради. " #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." msgstr "Када сте направили неке измене у фајловима у вашој радној копији и проверите да то ради исправно, Субверзија вам омогућава командама да публикујете ваше измене другим људима који раде са вама на вашем пројекту (писањем у спремиште). Ако други људи публикују своје измене, Субверзија вам омогућава командама за спајање тих измена у ваш радни именик (читањем из спремишта)." #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." msgstr "Радна копија такође садржи неке екстра фајлове, креиране и одржаване Субверзијом, дајој помогну да извуче ове команде. Посебно, сваки именик у вашој радној копији садржи подименике означене .свн, такође познат као радна копија административни именик. Фајлови у сваком административном именику помажу Субверзији да препозна који фајлови садрже непубликоване измене, и који фајлови су застрели у односу на рад других." #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." msgstr "Типично Субверзионо спремиште често садржи фајлове (или изворни код) за више пројеката; обично, сваки пројекат је субименик у стаблу фајлсистема у спремишту. У овом уређењу корисничка радна копија обично ће кореспондирати посебном подстаблу спремишта." #. (para) @@ -903,12 +903,12 @@ msgstr "Да бисте добили радну копију морате button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." msgstr "Претпоставимо да сте направили измене у буттон.ц. Како .свн именик памти датум измене фајла и оригинални садржај, Субверзија вам може рећи да сте изменили фајл.Чин публиковања ваших измена је најчешће познат као урезивање (или пријављивање) измена у спремиште." #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." +msgid "To publish your changes to others, you can use Git's commit command." msgstr "Да би публиковали ваше измене другима, можете користити Субверзиону команду урежи." #. (para) @@ -918,17 +918,17 @@ msgstr "Сада ваше измене у буттон.ц #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." msgstr "Претпоставимо да имате сарадника Сали, ко проверава радну копију /калк у исто време кад и ви. Када урезујете ваше измене у буттон.ц, Салина радна копија остаје непромењена; Субверзија мења радну копију само на захтев корисника." #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." msgstr "Да би ажурирала свој пројекат Сали мора питати Субверзилу да ажурира њену радну копију коришћрњем Субверзионе команде ажурирај. Ово ће укључити ваше измене у радну копију исто као што било који други који су урезани од провере." #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." msgstr "Забележите да Сали не треба да специфира које фајлове ажурира; Субверзија користи информације у .свн именику, и даље информације у спремишту, да одлучи које фајлове треба ажурирати." #. (title) @@ -938,7 +938,7 @@ msgstr "УРЛ спремишта" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" msgstr "Субверзионом спремишту може бити приступљено кроз много различитих метода - на локалном диску, или кроз разне мрежне протоколе. Мест спремишта, међутим, је увек на УРЛ. УРЛ шема означава метод приступа: " #. (title) @@ -975,7 +975,7 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." +msgid "Access via WebDAV protocol to Git-aware Apache server." msgstr "Приступ преко ВебДАВ протокола за Субверзионо познавање Апаш сервера." #. (literal) @@ -1021,7 +1021,7 @@ msgstr "аутентичан, шифриран ТЦП/ИП приступ пре #. (para) #: ../source/TortoiseGit_en.xml:1168 -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." msgstr "За многе делове Субверзиони УРЛови користе стандардну синтаксу дозвољавајући серверским именима бројевима портова да буду специфицирани као део УРЛа. филе:// метод приступа се нормално користи за локални приступ, такође може се користити са УНЦ путњом до мрежног домаћина. УРЛ дакле узима облик филе://хостнаме/патх/то/репос. За локалну машину хостнаме део УРЛ се захтева да није присутно или да је лоцалхост. Из овог разлога локална путања се нормално јавља са три косе црте филе:///патх/то/репос." #. (para) @@ -1081,7 +1081,7 @@ msgstr "Операција свн урежи публикуј #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." msgstr "У спремишту савако урезивање се тртира као атомик трансакција: или се урежу све промене или ниједна. Субверзија чува ову атомичност у случају пуцања програма или система, мрежних проблема и других акција корисника." #. (para) @@ -1101,7 +1101,7 @@ msgstr "Глобални ревизиони бројеви" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" msgstr "Другачије него код већине других система контроле верзија, Субверзиони ревизиони бројеви се појављују као цела стабла, а не индивидуални фајлови. Сваки ревизиони број селектује цело стабло, партикуларно стање спремишта после неког урезивања измена. Други начин размишљања о томе је да ревизија Н претставља стање фајлсистема спремишта после Нтог урезивања. Када корисник Субверзије говори о ``ревисија 5 од фоо.ц'', он стварно мисли ``фоо.ц како се јавља у ревизији 5.\" Приметимо да уопште ревизије Н и М фајла нису обавезно различите. " #. (para) @@ -1163,7 +1163,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." msgstr "Саине измене интегер.ц се појављују у вашој радној копији и ваше измене су још присутне у буттон.ц. У овом примеру, текст у Макефиле је идентичан у ревизијама 4,5 и 6, али Субверзија ће означити вашу радну копију Макефиле ревизијом 6 да индицира да је још текућа. Тако, после урађеног чистог ажурирања на врх ваше радне копије она ће генерално кореспондирати тачно једној ревизији у спремишту." #. (title) @@ -1173,7 +1173,7 @@ msgstr "Како радна копија прати спремиште" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" msgstr "За сваки фајл у радном именику Субверзија уписује два важна комада информација у .свн/ администаративну област:" #. (para) @@ -1188,7 +1188,7 @@ msgstr "временски маркер записан када се локал #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" msgstr "Дајући ове информације, говорећи спремишту, Субверзија може рећи које од следећих четири статуса има радни фајл:" #. (term) @@ -1228,7 +1228,7 @@ msgstr "Локално измењен и застарео" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." msgstr "Фајл је измењен у оба случаја и у радном именику и у спремишту. Урезивање фајла биће неуспешно са грешком застарео. Фајл се мора најпре ажурираи; са ажурирај командом покушаће се спајање јавних измена са локалним изменама. Ако Субверзија не може потпуно да стопи на разуман начин аутоматски, она оставља кориснику да разреши конфликт. " #. (title) @@ -1238,7 +1238,7 @@ msgstr "Закључак" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" msgstr "Ми смо овде покрили одређени број основних Субверзионих концепата:" #. (para) @@ -1248,12 +1248,12 @@ msgstr "Увели смо означавање централног спреми #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." msgstr "Видли смо неке просте примере како сарадници могу да користе Субверзију да публикују и приме измене од других, користећи 'копирај-мењај-стопи' модел." #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." msgstr "Говорили смо о начину како Субверзија прати и управља информацијама у радној копији." #. (title) @@ -1263,12 +1263,12 @@ msgstr "Подешавање сервера" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." msgstr "Да користите ТортоисеСВН (или било који други Субверзиони клијент), потребно вам је место где је лоцирано ваше спремиште. Можете ускладиштити ваше спремиште локално и приступати му користећи филе:// протокол или га сместити на сервеу и приступати му са хттп:// или свн:// протоколима. Два сервер протокола могу, такође, бити шифрована. Користите хттпс:// или свн+ссх://. Ово поглавље приказује корак по корак како подешавате такав сервер на Виндоуз машини. " #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." msgstr "Детаљније информације о опцијама Субверзионог сервера и како изабрати најбољу архитектуру за вашу ситуацију, може се наћи у књизи Субверзије под Сервер конфигурација." #. (para) @@ -1293,7 +1293,7 @@ msgstr "Апаш" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" msgstr "Најфлексибилнији од свих могућих сервер подешавања за Субверзију је Апаш засновани сервер. Мада је мало компликованији за подешавање он пружа погодности које други сервери немају:" #. (primary) @@ -1305,7 +1305,7 @@ msgstr "ВебДАВ" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." msgstr "Апаш заснован Субверзиони сервер користи ВебДАВ протокол који је добро подржан са много других програма. Могли бисте нпр. поставити спремиште као Веб именик/qуоте> у Виндоуз експлореру и да му приступате као сваком другом именику фајл система." #. (term) @@ -1315,7 +1315,7 @@ msgstr "Претраживање спремишта" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." msgstr "Можете довести ваш претраживач на УРЛ спремишта и претраживати његов садржај без инсталираног Субверзионог клијента. Ово даје приступ вашим подацима много ширем кругу корисника." #. (term) @@ -1397,17 +1397,17 @@ msgstr "Прва свар која вам је потребна пре инст #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" +msgid "Installing Git" msgstr "Инсталирање Субверзије" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Скините задњу верзију Субверзије Вин32 бинарије за Апаш. Будите сигурни да сте добили исправну верзију за интеграцију са вашом верзијом Апаша, у супротном ће те добити чудне поруке грешке када пробате са рестартом. Ако имате Апаш 2.2.x идите на http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Скините задњу верзију Субверзије Вин32 бинарије за Апаш. Будите сигурни да сте добили исправну верзију за интеграцију са вашом верзијом Апаша, у супротном ће те добити чудне поруке грешке када пробате са рестартом. Ако имате Апаш 2.2.x идите на http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." msgstr "Покрените Субверзиону инсталацију и пратите инструкције. Ако инсталација Субверзије препозна да сте инсталирали Апаш онда је у реду. Ако не нађе Апаш сервер морате урадити неке додатне кораке." #. (primary) @@ -1419,12 +1419,12 @@ msgstr "мод_аутхз_свн" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "Користећи виндоуз претраживач идите на инсталациони именик Субверзије (обично c:\\program files\\Subversion) и нађите фајлове /httpd/mod_dav_svn.so и mod_authz_svn.so. Копирајте ове фајлове у Апаш именик модула (обично c:\\program files\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "Користећи виндоуз претраживач идите на инсталациони именик Субверзије (обично c:\\program files\\Git) и нађите фајлове /httpd/mod_dav_svn.so и mod_authz_svn.so. Копирајте ове фајлове у Апаш именик модула (обично c:\\program files\\apache group\\apache2\\modules )." #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." msgstr "Копирајте фајл /бин/либдб*.длл и /бин/интл3_свн.длл из Субверзијиног инсталационог именика у Апаш бин именик." #. (para) @@ -1468,12 +1468,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "На крај конфиг фајла додајте следеће линије:\n" "<Location /svn>\n" @@ -1482,7 +1482,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -1511,12 +1511,12 @@ msgstr "Рестртујте Апаш сервер поново." #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." msgstr "Управите ваш претраживач на http://MyServer/svn/MyNewRepository (где је MyNewRepository име Субверзионог спремишта које сте раније креирали). Ако је све добро прошло бићете упитани за корисничко име и лозинку, затим можете видети садржај спремишта." #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " msgstr "Сада можете подесити Апаш и Субверзију, али Апаш још не зна како да опслужи Субверзионог клијента као што је ТортоисеСВН. Да би Апаш знао који УРЛ треба користити за Субверзионо спремиште морате да уредите Апаш конфигурациони фајл )обично на локацији c:\\program files\\apache group\\apache2\\conf\\httpd.conf) било којим уређивачем текста који волите (нпр. Нотепад): " #. (primary) @@ -1555,17 +1555,17 @@ msgstr "http://MyServer/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " +msgid "means that the Git repositories are available from the URL " msgstr "значи да је Субверзионо спремиште доступно са УРЛ " #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." msgstr "каже Апашу који модул је одговоран да опслужи тај УРЛ - у овом случају Субверзиони модул." #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." msgstr "За Субверзију 1.3 и више, ова директива омгућава листање свих расположивих спремишта под ." #. (filename) @@ -1575,7 +1575,7 @@ msgstr "Д:\\СВН" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " +msgid "tells Git to look for repositories below " msgstr "каже Субверзији да погледа спремиште испод " #. (entry) @@ -1600,7 +1600,7 @@ msgstr "одређује који фајл лозинки користити з #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" +msgid "Location of the Access file for paths inside a Git repository" msgstr "Локација фајла рачуна за путање унутар Субверзионог спремишта" #. (entry) @@ -1632,7 +1632,7 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "Коришћење пассwд фајла ограничава и гарантује приступ свим вашим спремиштима као јединицама. Ако желите више контроле на то који корисници имају приступ сваком именику унутар спремишта можете откоментирати линију \n" "#AuthzSVNAccessFile svnaccessfile\n" @@ -1676,12 +1676,12 @@ msgstr "Индекс пројекта" #. (para) #: ../source/TortoiseGit_en.xml:1955 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." msgstr "Ако сте користили СВНПредакПутања директиву затим ви нисте мењали Апаш кофиг фајл сваки пут када сте додавали ново Субверзионо спремиште. Једноставно креирајте ново спремиште под истом лкацијом као прво спремиште и ви сте завршили! У мојој компанији ја имам директан приступ специфичном именику на серверу преко СМБ (нормалан виндоуз приступ фајловима). Тако сам само креирао нови именик тамо, покренуо ТортоисеСВН команду ТортоисеСВНЦреате репоситорy хере... и нови пројекат је добио дом..." #. (para) #: ../source/TortoiseGit_en.xml:1969 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." msgstr "Ако користите Субверзију 1.3 или каснију, морате користити СВНЛистајПредакПутању на директиву да омогућите Апашу да да листинг свих доступних пројеката ако управите ваш претраживач на предачку путању пре него на посебно спремиште. " #. (title) @@ -1696,7 +1696,7 @@ msgstr "Ауторизација" #. (para) #: ../source/TortoiseGit_en.xml:1984 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." msgstr "Модул мод_аутхз_свн омогућава фино-зрнасту контролу на дозволама заснованог приступа корисничких имена и путања спремишта. Ово је омогућено Апаш сервером и од Субверзије 1.3 могуће је са свнсерв." #. (para) @@ -1835,7 +1835,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1880,7 +1880,7 @@ msgstr "Да омогућите ССЛ на вашем серверу, види #. (para) #: ../source/TortoiseGit_en.xml:2140 -msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." msgstr "Субверзиони АутхзСВНАццессФиле фајлови су осетљиви на величину слова у именима корисника (ЈУсер је различито одјусер)." #. (para) @@ -1890,7 +1890,7 @@ msgstr "У Микрософтовом свету, Виндоуз домени и #. (para) #: ../source/TortoiseGit_en.xml:2150 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." msgstr "Ова разлика вас може угристи када користите ССПИ аутентификацију као виндоуз домен и корисничко име прође у Субверзију у истом облику како га је корисник откуцао у промпту. Интернет Експлорер често пропушта корисничко име ка Апашу аутоматски користећи било коју веичину слова без обзира како је рачун исписан." #. (para) @@ -1900,7 +1900,7 @@ msgstr "Крајњи резултат је да вам можда треба н #. (para) #: ../source/TortoiseGit_en.xml:2166 -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." msgstr "Апашев дневник грешака и приступа је ваш најбољи пријатељ при дешифровању проблема као што су они који вам помажу да откријете стринг корисничког имена у свнаццессфиле (нпр. ДОМАИН\\усер према ДОМАИН//усер) да би добили да све ради." #. (title) @@ -1915,7 +1915,7 @@ msgstr "Вишеструке аутентификације" #. (para) #: ../source/TortoiseGit_en.xml:2184 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." msgstr "Могуће је имати више од једног аутентификационог извора за Субверзионо спремиште. Да се то уради потребно је направити сваки аутентификациони тип неауторитативан тако да Апаш проверава вишеструке изворе да би дохватио корисник/лозинка." #. (para) @@ -1945,7 +1945,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1970,7 +1970,7 @@ msgstr "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2097,12 +2097,12 @@ msgstr "ССЛ и Интернет Експлорер" #. (para) #: ../source/TortoiseGit_en.xml:2339 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." msgstr "Ако осигурате ваш сервер са ССЛ и користите аутентификацију према Виндоуз домену ви ћете наћи да претраживање спремишта Интернет Експлорером уопште не ради. Не брините - то само Интернет Експлорер није способан да аутентификује. Други претраживачи немају тај проблем и ТортоисеСВН и било који други Субверзиони клијент још може да аутентификује." #. (para) #: ../source/TortoiseGit_en.xml:2353 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." msgstr "дефинишите одвојену &лт;Лоцатион /патх&гт; директиву у Апаш конфиг фајлу, и додајте ССПИБасицПреферред Он. Ово ће омогућити ИЕ да аутентификује опет, али други претраживачи и Субверзија нису способни да аутентификују према локацији." #. (para) @@ -2137,7 +2137,7 @@ msgstr "Форсирање ССЛ приступа" #. (para) #: ../source/TortoiseGit_en.xml:2395 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." msgstr "Када се подеси ССП да учини спремиште сигурним, можете желети да онемогућити нормални приступ преко нон-ССЛ (хттп) и дозвољава само хттпс приступ. Да се то уради, треба додати још једну директиву у Субверзију <Location> block: SSLRequireSSL." #. (para) @@ -2149,7 +2149,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2162,7 +2162,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2181,7 +2181,7 @@ msgstr "Послато ТортоисеСВН поштанској листи о #. (para) #: ../source/TortoiseGit_en.xml:2424 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." msgstr "У неким серверским конфигурацијама треба да подесите поједначни сервер који садржи 2 виртуална ССЛ домаћина: Први за публик веб приступ, без захтева за клијентске сертификате. Други да буде сигуран са тражењем сертификата клијента, извршавајући Субверзиони сервер." #. (para) @@ -2192,7 +2192,7 @@ msgstr "Додавање ССЛПривераКлијента Опци #. (para) #: ../source/TortoiseGit_en.xml:2440 msgid "" -"The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" @@ -2214,10 +2214,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2239,10 +2239,10 @@ msgstr "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2260,7 +2260,7 @@ msgstr "Свнсерв заснован сервер" #. (para) #: ../source/TortoiseGit_en.xml:2485 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." msgstr "Могу се јавити ситуације где није могућw да се користи Апаш као сервер. Срећом, Субверзија укључује Свнсерв - једноставан самосталан сервер који користи обичан протокол преко редовне ТЦП/ИП везе." #. (para) @@ -2275,22 +2275,22 @@ msgstr "Исталирање свнсерва" #. (para) #: ../source/TortoiseGit_en.xml:2502 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." -msgstr "Узмите задњу верзију Субверије са http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Алтернативно узмите упаковану инсталацију од КолабНета са http://www.collab.net/downloads/subversion. Ова инсталација ће подесити свнсерв као Виндоуз сервис, такђе укључује неке алате који су вам потребни ако намеравате да користите САСЛ за сигурност." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgstr "Узмите задњу верзију Субверије са http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Алтернативно узмите упаковану инсталацију од КолабНета са http://www.collab.net/downloads/Git. Ова инсталација ће подесити свнсерв као Виндоуз сервис, такђе укључује неке алате који су вам потребни ако намеравате да користите САСЛ за сигурност." #. (para) #: ../source/TortoiseGit_en.xml:2516 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." msgstr "Ако већ имате верзију Субверзије и покренут је свнсерв, требаће да га зауставите пре него наставите." #. (para) #: ../source/TortoiseGit_en.xml:2522 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." msgstr "Покрените Субверзиону инсталацију. Ако радите инсталацију на вашем серверу (препоручљиво) прескочите корак 4." #. (para) #: ../source/TortoiseGit_en.xml:2528 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" msgstr "Отворите виндоуз-експлорер, идите на инсталациони директоријум Субверзије (обично Ц:\\Програм Филес\\Субверсион) и на < филенаме>бин именик, нађите фајлове свнсерве.еxе, интл3_свн.длл, либапр.длл, либаприцонв.длл, либаприутил.длл, либдб*.длл, либеаy32.длл анд сслеаy32.длл - копирајте ове фалове, или само копирајте све из бин именика, у именик на вашем серверу нпр. ц:\\свнсерве" #. (title) @@ -2361,7 +2361,7 @@ msgstr "Покретање свнсерва као Сервис" #. (para) #: ../source/TortoiseGit_en.xml:2624 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." msgstr "Покретање свнсерва као корисник није најбољи начин. То значи да има корисник који је увек уписан на вашем серверу и памти се да се рестартује после поновног покретања. Бољи начин је да покренете свнсерв као виндоуз сервис. Почевши од Субверзије 1.4, свнсерв се може инсталирати као природни виндоуз сервис." #. (para) @@ -2369,28 +2369,28 @@ msgstr "Покретање свнсерва као корисник није н msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Да би се инсталирао свнсерв као природни виндоуз сервис извршите следећу команду, целу на једној линији, да креирате сервис који аутоматски креће кад виндоуз крене. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" #. (para) @@ -2403,7 +2403,7 @@ msgstr "Приметимо непожељан формат командне ли msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Микрософт сада препоручује сервисе да раде под или ЛокалСервис или МрежниСервис налог. Упоредите са Сервиси и Сервис налог сигурност водич планирања . Да би се креирао сервис под Локал Сервис налогом, додајте следеће горњем примеру. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" @@ -2485,7 +2485,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2755 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" msgstr "Ако одржавате више спремишта користећи исту базу лозинки, коришћење аутентификационе области олакшће живот корисницима, како ТортоисеСВН кешира вашу акредитацију ви ћете је урадити само једанпут. Више информација се може наћи у Субверзионој књизи, специјално у делу Креирајте 'усерс' фајл и област и Клиент Креденциалс Кешинг" #. (title) @@ -2505,12 +2505,12 @@ msgstr "Шта је САСЛ?" #. (para) #: ../source/TortoiseGit_en.xml:2779 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." msgstr "Цирус једноставна аутентификација и сигурносни слој је софтвер отвореног кода написан на Карнеги Мелон универзитету. Он додаје сродну аутентификацију и могућности шифрирања сваком мрежном протоколу и од Субверзије 1.5 и даље, оба, свнсерв и ТортоисеСВН клијенти знају како да користе ову библиотеку. " #. (para) #: ../source/TortoiseGit_en.xml:2787 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." msgstr "За комплетнију дискусију доступних опција треба погледати Субверзиону књигу у делу Користећи свнсерв са САСЛ . Ако сте само потражили лак начин да подесите сигурну аутентификацију и шифрирање на Виндоуз серверу вашем спремишту ће се приступати преко великог лошег Интернет читања." #. (title) @@ -2531,12 +2531,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2810 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." msgstr "Друго, креирајте фајл који се зове свн.цонф на конвенционалну локацију - типично у именику где је субверзија инсталирана." #. (para) #: ../source/TortoiseGit_en.xml:2815 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." msgstr "Треће, креирајте два нова регистар улаза да кажете САСЛ где да нађе потребне стварчице. Креирајте регистар кључ под именом [ХКЕY_ЛОЦАЛ_МАЦХИНЕ\\СОФТWАРЕ\\Царнегие Меллон\\Пројецт Цyрус\\САСЛ Либрарy] и ставите два нова стринга унутар њега: СеарцхПатх подесите на путању именика који садржи сасл*.длл плагин (нормално у Субверзиони инсталациони именик), и ЦонфФиле подешен на именик који саџи свн.цонф фајл. Ако користите КолабНет инсталатор, ови регистар кључеви ће бити већ креирани за вас." #. (para) @@ -2626,7 +2626,7 @@ msgstr "Основни метод подешавања вашег сервера #. (para) #: ../source/TortoiseGit_en.xml:2915 -msgid "Further information about svnserve can be found in the Version Control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." msgstr "Даље информације о свнсерву могу се наћи на Версион Цонтрол wитх Субверсион." #. (title) @@ -2637,7 +2637,7 @@ msgstr "Путањом-заснована ауторизација са свнс #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." @@ -2649,12 +2649,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2946 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." msgstr "Није битно који протокол користите да приступите спремишту, увек вам је потребно да креирате бар једно спремиште. Ово може бити урађено Субверзионом командном линијом или клијентом са ТортоисеСВН." #. (para) #: ../source/TortoiseGit_en.xml:2951 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." +msgid "If you haven't created a Git repository yet, it's time to do that now." msgstr "Ако још нисте креирали Субверзионо спремиште, време је да то урадите сада." #. (title) @@ -2669,7 +2669,7 @@ msgstr "креирај спремиште" #. (para) #: ../source/TortoiseGit_en.xml:2963 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." msgstr "Можете креирати спремиште са ФСФС крај или стари Беркли база података (БДБ) формат. ФСФС формат је генерално бржи и лакши за администрацију, ради на мрежном дељеном простору и Виндоуз 98 без проблема. БДБ формат је замишљен много стабилнијим једноставно зато што се дуже користи, али од како је ФСФС у употреби неколико година тај аргумент је све слабији. Прочитајте Избор смештанја података у Субверзионој књизи за више информација." #. (title) @@ -2781,7 +2781,7 @@ msgstr "УНЦ путања" #. (para) #: ../source/TortoiseGit_en.xml:3094 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." msgstr "Да се приступи локалном спремишту потрбна је путања до тог именика. Сетимо се да Субверзија очекује све путање спремишта у облику филе:///Ц:/СВНРепоситорy/. Запазимо коришћење правих косих црта у целој путањи." #. (para) @@ -2821,7 +2821,7 @@ msgstr "Најпре дајете сваком кориснику директн #. (para) #: ../source/TortoiseGit_en.xml:3141 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." msgstr "Друго, неће сви протоколи за мрежни дељени простор подржаватизакључавање које захтева Субверзија, тако да можете наћи ваше спремиште покварено. То се не мора десити одмах, али једног дана два корисника могу покушати да приступе спремишту у исто време. " #. (para) @@ -2925,7 +2925,7 @@ msgstr "Ако усвојимо вршни ниво /трунк /та #. (para) #: ../source/TortoiseGit_en.xml:3220 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." msgstr "За пројекте који нису повезани можете више волети да користите одвојена спремишта. Када урезујете измене, ревизиони број целог спремишта се мења, не ревизиони број пројекта. Ако имате 2 независна пројекта дељење спремишта може значити велике празнине у ревизионим бројевима. Субверзија и ТортоисеСВН пројекти се појављују на истим адресама домаћина, али су сасвим независна спремишта омогућавајући независан развој и нема кофузије око развојних бројева." #. (para) @@ -3014,8 +3014,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3332 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "Алат свнадмин је инсталиран аутоматски када инсталирате Субверзионог клијента командне линије. Ако инсталирате алат командне линије на Виндоуз ПЦ, најбољи начин је да скинете Виндоуз инстолер верзију. Она је ефикасније компримована него .зип верзија, тако да је скидање мање, и оно води бригу да подеси путању за вас. Можете скибути задњу верзију Субверзионог клијента командне линије са http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "Алат свнадмин је инсталиран аутоматски када инсталирате Субверзионог клијента командне линије. Ако инсталирате алат командне линије на Виндоуз ПЦ, најбољи начин је да скинете Виндоуз инстолер верзију. Она је ефикасније компримована него .зип верзија, тако да је скидање мање, и оно води бригу да подеси путању за вас. Можете скибути задњу верзију Субверзионог клијента командне линије са http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:3347 @@ -3041,7 +3041,7 @@ msgstr "закачиве скрипте са серверске стране" #. (para) #: ../source/TortoiseGit_en.xml:3357 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." msgstr "Закачиве скрипте су програми окидане неким догађајем из спремишта, као што је креирање нове ревизије или измена неверзиониране особине. Свака закачаљка је руковођена са довољно информација да кже који догађај се десио, који окидач(и) је покренуо и корисничко име особе која је окинула догађај. У зависности од излаза закачаљке или повратног статуса, закачив програм може наставити акцију, заиставити је, или суспендовати на неки начин. Молим вас да погледате поглавље Закачиве скрипте у Субверзионој књизи за пуне детаље о закачаљкама које су имплементиране." #. (para) @@ -3093,7 +3093,7 @@ msgstr "вебсајт" #. (para) #: ../source/TortoiseGit_en.xml:3411 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." msgstr "Ако желите учинити ваше Субверзионо спремиште доступно другима морате укључити везу ка њему од вашег вебсајта. Један начин да се то уради много приступчније је да се укључи веза преузимања за друге ТортоисеСВН кориснике." #. (para) @@ -3159,17 +3159,17 @@ msgstr "Водич дневног коришћења" #. (para) #: ../source/TortoiseGit_en.xml:3457 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." msgstr "Овај документ описује коришћење дан за даном клијента ТортоисеСВН. То није увод у систем контроле верзија, и није увод у Субверзију (СВ). То је више као место где се можете вратити тамо где приближно знате шта желите да урадите, али не разумете како да то урадите." #. (para) #: ../source/TortoiseGit_en.xml:3465 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." msgstr "Ако желите увод у контролу верзија са Субверзијом, препоручујемо вам да прочитате фантастичну књигу: Контрола верзија са Субверзијом." #. (para) #: ../source/TortoiseGit_en.xml:3472 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." msgstr "Овај документ је такође у раду, као и ТортоисеСВН то је и Субверзија. Ако нађете неку грешку, молим вас пошаљите је на поштанску листу да можемо ажурирати документацију. Неке слике екрана у Водичу дневног коришћења (ВДК) можда не одражавају текуће стање софтвера. Молим вас да нам опростите. Ми радимо на ТортоисеСВН у своје слободно време." #. (para) @@ -3184,12 +3184,12 @@ msgstr "Требало би да сте фамилијарни са систем #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." +msgid "You should know the basics of Git." msgstr "Требало би да знате основе Субверзије." #. (para) #: ../source/TortoiseGit_en.xml:3499 -msgid "You should have set up a server and/or have access to a Subversion repository." +msgid "You should have set up a server and/or have access to a Git repository." msgstr "Требало би да имате подешен сервер и-или да имате приступ Субверзионом спремишту." #. (para) @@ -3379,12 +3379,12 @@ msgstr "свн.усернаме садржи акредит #. (para) #: ../source/TortoiseGit_en.xml:3650 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " msgstr "Ако је спремиште коме покушавате да приступите заштићено лозинком, аутентификациони дијалог ће вам бити приказан. Унесите корисничко име и лозинку. Бокс прове ће учинити да ТортоисеСВН смести акредитацију у Субверзионом уобичајеном именику: %APPDATA%\\Субверсион\\аутх у стаблу субименика: " #. (para) #: ../source/TortoiseGit_en.xml:3681 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." msgstr "Ако желите да обришете аутентификациони кеш за све сервере, можете то урадити од Запамћени подаци стране ТортоисеСВН дијалога подешавања.То дугме ће очистити све аутентификационе кеширане податке из Субверзионог аутх именика, као и било који аутентификациони податак смештен у регистру од ранијих верзија ТортоисеСВН. Упоредите са ." #. (para) @@ -3460,7 +3460,7 @@ msgstr "Лако је увести у лош ниво именика у спре #. (para) #: ../source/TortoiseGit_en.xml:3736 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "Овај део описује Субверзиону команду увоза, која је дизајнирана за увоз хијерархију именика у спремиште у једном опаљењу. Без обзира што то завршава посао то има више грешака: Из ових разлога препоручујемо да не користите команду увоза уопште већ радије пратите двостепен метод описан у . Али пошто сте овда, ево како основни увоз ради ..." #. (para) @@ -3580,7 +3580,7 @@ msgstr "Као пример можете погледати ТортоисеСВ #. (para) #: ../source/TortoiseGit_en.xml:3916 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." msgstr "Да не би узнемиравали кориснике такође додамо фајл ТортоисеВарс.бат листи занемарених предачког именика, тј. ми смо подесили Субверзиону особину свн:занемари да укључи то име фајла. На тај начин он се неће показати неверзионисаним код сваког урезивања." #. (title) @@ -3608,11 +3608,11 @@ msgstr "Понекад је корисно да се консултује рад #. (para) #: ../source/TortoiseGit_en.xml:3940 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" "Рецимо да сте преузели радну копију од /project1 до D:\\dev\\project1. Изаберите именик D:\\dev\\project1, десни клик и изаберите Виндоуз МениОсобине из контекст менија. Особине дијалог долази. Затим идите на таб Субверзија. Тамо можете подесити особине. Кликните Додај.... Изаберите свн:спољашње особине у комбобоксу и напишите УРЛ спремишта у формату име урл или ако желите да специфицирате партикуларну ревизију, име -рРЕВ урл Мжете додати вишеструке спољашње пројекте, 1 по линији. Приметимо да тај УРЛ мора бити одговарајуће попуњен косим цртама или то неће радити. На пример морате заменити сваки размак са %20. Приметимо да није могуће користити имена именика са размацима у њима. Претпоставимо да имате подешене ове особине на D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" @@ -3646,7 +3646,7 @@ msgstr "Ако користите апсолутне УРЛове у с #. (para) #: ../source/TortoiseGit_en.xml:4016 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." msgstr "Да се избегну такви проблеми Субверзиони клијенти од верзије 1.5 подржавају релативне спољашње УРЛове. Четири различита метода специфицирања релативних УРЛова је подржано. У следећем примерима узмимо да имамо два спремишта: једно на сyстемитем цласс=\"урл\">http://example.com/svn/repos-1 и друго на http://example.com/svn/repos-2. Преузели смо http://example.com/svn/repos-1/project/trunkу C:\\Working и свн:спољашње особине су подешене на дебло." #. (term) @@ -3875,7 +3875,7 @@ msgstr "Поновите исти процес за Пројецт25Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." msgstr "Управите се ка Project76/SubProj и урадите исто. Овог пута приметимо да Project76 именик нема садржај осим за SubProj, који је сам потпуно поппуњен. Субверзија је креирала прелазне именике за вас не попуњавајући их." #. (title) @@ -3885,7 +3885,7 @@ msgstr "Дубина радне копије не може да се умањи" #. (para) #: ../source/TortoiseGit_en.xml:4309 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." msgstr "Када једном преузмете радну копију до одређене дубине можете повећати дубину касније да дођете до више садржаја. међутим не можете редуковати дубину да избаците садржај. Ова особина ће бити додата у каснијим верзијама Субверзије." #. (title) @@ -4027,7 +4027,7 @@ msgstr "Колоне приказане у доњем панелу су прил #. (para) #: ../source/TortoiseGit_en.xml:4495 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." msgstr "Уобичајено је да када се урезују измене, свако закључавање које држите на фајловима се аутоматски откључава после задовољавајућег урезивања. Ако желите да задржите закључавање будите сигурни да је Чувај закључавање чекбокс је чекиран. Уобичајено стање овог чекбокса узет је из no_unlock опције у Субверзионом конфигурационом фајлу. Прочитајте за информације како уредити Субверзиони конфигурациони фајл." #. (para) @@ -4051,7 +4051,7 @@ msgstr "Поправка спољашњих преименовања" #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5337 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "Понекад се фајлови преименују ван Субверзије, и они су приказани у листи фајлова као фајл који недостаје или неверзионисани фајл. Да би избегли губљење историје потребно је нотирати Субверзији о вези. Једноставно изаберите обе ставри, старо име (недостајуће) и ново име (неверзионисано) користи Контекст МениПоправи Померање да се упаре два фајла као преименовање." #. (title) @@ -4063,7 +4063,7 @@ msgstr "Листе измена" #. (para) #: ../source/TortoiseGit_en.xml:4539 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "Дијалог урезивања подржава Субверзијину листу измена особине да помогне груписањем одговарјућих фајлова заједно. Нађите о овим особинама на ." #. (title) @@ -4347,7 +4347,7 @@ msgstr "Локални фајл већ постоји" #. (para) #: ../source/TortoiseGit_en.xml:4881 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." msgstr "Понекад док покушавате да ажурирате, ажурирање не успе са поруком која каже да већ постоји фајл са истим именом у вашем радном именику. Субверзија никада неће преклопити неверзионисани фајл - он може садржати нешто на чему радите, што случајно има исто име које је други човек из развоја узео за свој ново урезани фајл." #. (para) @@ -4397,19 +4397,19 @@ msgstr "филенаме.еxт.рНЕWРЕВ" #. (para) #: ../source/TortoiseGit_en.xml:4960 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." msgstr "ово је фајл који је ваш Субверзиони клијент управо примио са сервера када сте ажурирали вашу радну копију. Овај фајл одговара ГЛАВНОЈ ревизији спремишта." #. (para) #: ../source/TortoiseGit_en.xml:4915 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" "Једном ћете добити конфликт док ажурирате ваше фајлове из спремишта. Конфликт се јавља када два или више људи измене исто неколико линија фајла. Како Субверзија незна ништа о вашем пројекту, она оставља решавање конфликта људима. Кадгод се конфликт изнесе треба да отворите фајл у питању и потражите линије које почињу стрингом <<<<<<<. Конфликтна област је маркирана као ово: \n" "<<<<<<< filename\n" @@ -4431,7 +4431,7 @@ msgstr "После извршења команде Торт #. (para) #: ../source/TortoiseGit_en.xml:4994 -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." msgstr "Ако имате конфликт са бинарним фајловима, Субверзија не покушава да стопи саме фајлове. Локални фајл остаје неизмењен (тачно као што сте га изменили) и ви имате filename.ext.r* фајлове. Ако желите да одбаците своје измене и задржите верзију из спремишта, само искористите команду Врати. Ако желите да задржите вашу верзију и да препишете верзију спремишта, користите команду Реши, и урежите своју верзију." #. (para) @@ -4480,13 +4480,13 @@ msgstr "иконе" #. (para) #: ../source/TortoiseGit_en.xml:5046 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." msgstr "Сада имате да преузмете радну копију из Субверзионог спремишта можете видети своје фајлове у виндоуз експлореру са измењеним иконама. Ово је резон зашто ТортоисеСВН тако популаран. ТортоисеСВН додаје такозване прекривне иконе за сваку фајл икону која прекрива оригиналну икону фајла. Зависно о Субверзионом стању фајл прекривна икона се разликује." #. (para) #: ../source/TortoiseGit_en.xml:5054 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " Свеже преузета радна копија има зелен чекмарку као прекривач. То значи да је Субверзиони статус нормалан." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " Свеже преузета радна копија има зелен чекмарку као прекривач. То значи да је Субверзиони статус нормалан." #. (para) #: ../source/TortoiseGit_en.xml:5059 @@ -4500,12 +4500,12 @@ msgstr " Ако се током #. (para) #: ../source/TortoiseGit_en.xml:5072 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." msgstr " Ако сте подесили svn:needs-lock особине фајла, Субверзија чини фајл само за читање док закључате фајл. Такви фајлови имају овај прекривач да означи да сте откључали најпре пре него уређујете фајл." #. (para) #: ../source/TortoiseGit_en.xml:5079 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." msgstr " Ако држите закчан фајл и Субверзиони статус је нормалан, овај прекривач икона вас подсећа да треба откључати фајл ако га не користите да омогућите другим корисницима да урезују своје измене у тај фајл." #. (para) @@ -4540,7 +4540,7 @@ msgstr "Сада има више Тортоисе клијента около ( #. (para) #: ../source/TortoiseGit_en.xml:5124 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." msgstr "За опис како иконе прекривачи одговарају Субверзионом статусу и остале техничке детаље прочитај ." #. (title) @@ -4977,7 +4977,7 @@ msgstr "Копира детаље дневника о изабраним рев #. (para) #: ../source/TortoiseGit_en.xml:5742 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." msgstr "Претражује дневник порука за текст који сте унели. То претражује дневник порука које сте унели и такође збирну акцију креирану Субверзијом (приказан у доњем панелу). Претраживање не зависи од величине слова." #. (para) @@ -5064,7 +5064,7 @@ msgstr "Вратити измене учињене изабраним фајло #. (para) #: ../source/TortoiseGit_en.xml:5843 -msgid "View the Subversion properties for the selected item." +msgid "View the Git properties for the selected item." msgstr "Види Субверзијине особине за изабрану ставку." #. (para) @@ -5089,17 +5089,17 @@ msgstr "Можете запазити да понекад говоримо о и #. (para) #: ../source/TortoiseGit_en.xml:5865 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." msgstr "Субверзија користи ревизионе бројеве да означи 2 различите ствари. Ревизија генерално представља стање спремишта у временском тренутку, али може такође, бити коришћена да представи скуп измена који је креирала та ревизија, нпр. quote>Дато у р1234 значи да су измене урезане у р1234 имплементирају особину X. Да се то учини јасним који осећај је коришћен, користимо два различита термина." #. (para) #: ../source/TortoiseGit_en.xml:5874 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." msgstr "Ако изабрете две ревизије N и M, контекст мени ће понудити да прикаже разлике између те две ревизије. У Субверзијиним терминима то је diff -r M:N." #. (para) #: ../source/TortoiseGit_en.xml:5880 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "Ако изаберете појединачну ревизију N, контекст мени ће понудити да прикаже измене направљене у тој ревизији. У Субверзијиним терминима то је diff -r N-1:N или diff -c N." #. (para) @@ -5134,7 +5134,7 @@ msgstr "Када је Прикажи Дневник дијалог позван #. (para) #: ../source/TortoiseGit_en.xml:5935 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." msgstr "Приметимо да Субверзија текуће поставља преименовање као копирај/бриши пар, тако преименовање фајла или именика ће такође, узроковати заустављање дисплеја дневника ако је ова опција чекирана." #. (para) @@ -5189,7 +5189,7 @@ msgstr "дневник спајања праћења" #. (para) #: ../source/TortoiseGit_en.xml:5990 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." msgstr "Субверзија 1.5 и касније чувају сведочанство о стапању користећи особине. Ово нам омогућава да добијемо детаљнију историју стопљених измена. На пример, ако развијате нове особине на грани и затим стопите ту грану назад у дебло, даљи развој ће показати у дневнику дебла поједначно урезивање за стапање, чак и ако можда има 1000 урезивања у току развоја гране." #. (title) @@ -5224,7 +5224,7 @@ msgstr "Понекад можете пожелети да измените дн #. (para) #: ../source/TortoiseGit_en.xml:6031 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." msgstr "Субвезија вам допушта да мењате дневник поруку и аутора ревизије кад год желите. Али како такве измене не могу бити поништене (те измене нису верзионисане) ова особина је подразумевано онемогућена. Да се уради овај посао, морате подесити пре-ревпроп-измене закачаљку. Молим погледајте поглавље на Hook Scripts у Субверзионој Књизи за детаље како да се то уради. Прочитајте да нађете неке даље белешке о примени закачаљки на Windows машини." #. (para) @@ -5234,7 +5234,7 @@ msgstr "Када једанпут подесите свој сервер са ж #. (para) #: ../source/TortoiseGit_en.xml:6051 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." msgstr "Пошто Субверзионе ревизионе особине нису верзионисане, прављењем измена у тим особинама (на пример, svn:log порука урезивања особина) ће прекрити претходну вредност особине заувек." #. (title) @@ -5284,7 +5284,7 @@ msgstr "Нема Дневника Форматирања из Претражив #. (para) #: ../source/TortoiseGit_en.xml:6119 -msgid "Because the formatting depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "Зато што форматирање зависи од приступа субверзионим подешавањима, ви само видите резултате када користите преузимање радне копије. Добављање особина даљински је споро, тако не можете видети ову особину у акцији репо претраживача." #. (title) @@ -5503,7 +5503,7 @@ msgstr "Разлике између РК фајл/именик и УРЛ" #. (para) #: ../source/TortoiseGit_en.xml:6382 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." msgstr "Ако желите да видите разлике између фајла у вашој радној копији, и фајл у било којем Субверзионом спремишту, можете то урадити директно у претраживачу избором фајла затим држећи Shift тастер док десним кликом добијете контекст мени. Изаберите ТортоисеСВНДифф са УРЛ. Можете урадити исту ствар за именик радне копије. ТортоисеМерге приказује ове разлике на исти начин као што је приказано у фајлу закрпе - листа измењених фајлова које можете прегледати један по један." #. (term) @@ -5898,7 +5898,7 @@ msgstr "знак" #. (para) #: ../source/TortoiseGit_en.xml:6826 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." msgstr "Често се дешава то да већ имате фајлове који су вам потребни у другом пројекту у вашем спремишту и једноставно желите да их копирате унутар. Можете једноставно копирати фајлове и додати их како је описано горе, али то вам неће дати историју. Ако субсеквентно фиксирате багове у оригиналним фајловима можете само стопити фиксирано аутоматски ако се нова копија односи на оригиналну Субверзију." #. (para) @@ -5983,7 +5983,7 @@ msgstr "Глобална листа занемаривања" #. (para) #: ../source/TortoiseGit_en.xml:6958 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." msgstr "Други нчин да се занемаре фајлови је да се додају у глобалну листу занемаривања. Велика разлика овде је да је глобална листа занемаривања је клијентска особина. Примењује се на све Субверзионе пројекте, али на само на клијентовом ПЦ. Генерално је боље да се користи svn:ignore особина када је могуће јер може бити примењена на специфичну област пројекта, и то ради за сваког ко преузме пројекат. Прочитајте за више информација." #. (title) @@ -5993,7 +5993,7 @@ msgstr "Занемаривање верзионисаних ставки" #. (para) #: ../source/TortoiseGit_en.xml:6972 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "Верзионисани фајлови и именици не могу бити никад занемарени - то је особина Субверзије. Ако верзионишете фајл грешком прочитајте за инструкције како да га одверзионишете." #. (title) @@ -6043,7 +6043,7 @@ msgstr "Чини сличним било који карактер затвор #. (para) #: ../source/TortoiseGit_en.xml:6987 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " msgstr "Субверзиони модел занемаривања користи глобалисање имена фајлова као технику оригинално корићену у Униксу да се специфицирају фајлови користећи мета-карактере као џокере. Следећи карактери имају специјална значења: " #. (para) @@ -6078,7 +6078,7 @@ msgstr "Експлореров контекст мени за верзионис #. (para) #: ../source/TortoiseGit_en.xml:7062 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " msgstr "Супротно ЦВС, Субверзија дозвољава преименовање и померање фајлова и именика. Тако да има мени улаза за брисање и преименовање у ТортоисеСВН субменију. " #. (title) @@ -6098,7 +6098,7 @@ msgstr "уклони" #. (para) #: ../source/TortoiseGit_en.xml:7079 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "Користи ТортоисеСВНБриши да се уклоне фајлови и именици из субверзије." #. (para) @@ -6108,7 +6108,7 @@ msgstr "Када урадите ТортоисеСВНTortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." msgstr "Када ТортоисеСВНБриши именик, остаје у вашој радној копији, али се прекривач мења да индицира да је маркиран за брисање. Све док не урежете измене можете вратити именик користећи ТортоисеСВна НВрати на сам именик. Ова разлика у понашању међу фајловима и именицима је део Субверзије, не ТортоисеСВН." #. (para) @@ -6118,12 +6118,12 @@ msgstr "Ако желите да обришете ставку из спреми #. (para) #: ../source/TortoiseGit_en.xml:7131 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." msgstr "Ако је фајл обрисан преко претраживача уместо коришћењем ТортоисеСВН контекст менија, дијалог урезивања приказује те фајлове и дозвољава вам да их уклоните из контроле верзија пре урезивања такође. Међутим, ако ажурирате вашу радну копију, Субверзија ће обележити фајл који недостаје и заменити га са задњом верзијом из спремишта. Ако вам треба да обришете верзија-контролисан фајл, увек користите ТортоисеСВНБриши тако да Субверзија не мора да погађа шта ви стварно желите да урадите." #. (para) #: ../source/TortoiseGit_en.xml:7145 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." msgstr "Ако је именик избрисан преко претраживача уместо користићи ТортоисеСВН контекст мени, ваша радна копија ће бити оштећена и ви нећети моћи да је урежете. Ако ажурирате вашу радну копију Субверзија ће заменити недостајући именик са задњом верзијом из спремишта и можете га тада обрисати на исправан начин користећи ТортоисеСВНОбриши." #. (title) @@ -6217,12 +6217,12 @@ msgstr "измена великих и малих слова" #. (para) #: ../source/TortoiseGit_en.xml:7274 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "Правећи измене у величини слова у фајлимену је трик са Субверзијом у Виндоузу, јер у кратком периоду у току преименовања, оба фајлимена постоје. Како Виндоуз има фајл систем независан од величине слова ово не ради коришћењем обичне Преименуј команде." #. (para) #: ../source/TortoiseGit_en.xml:7280 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" msgstr "Срећом постоји (најмање) два могућа метода за преименовање фајла без губтка његове историје. Важно је да се он преименује у оквиру субверзије. Само преименовање у претраживачу поквариће вашу радну копију!" #. (para) @@ -6274,7 +6274,7 @@ msgstr "Рад са конфликтом величине слова у имен #. (para) #: ../source/TortoiseGit_en.xml:7336 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." msgstr "Ако спремиште већ садржи два фајла са истим именом који се разликују само у величини слова (нпр. TEST.TXT и test.txt), ви нећете моћи да ажурирате или преузмете предачки именик на Виндоуз клијенту. Пошто Субверзија подржава фајлимена зависна од величине слова, Виндоуз то не ради." #. (para) @@ -6304,12 +6304,12 @@ msgstr "Исправка преименовања фајлова" #. (para) #: ../source/TortoiseGit_en.xml:7368 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." msgstr "Понекад ваш пријатељски ИДЕ ће преименовати фајлове за вас као део прављења примера, и свакако то не каже Субверзији. Ако покушате да урежете своје измене Субверзија ће видети стара фајлимена као недостајућа и нова као неверзионисане фајлове. Можете само проверити ново фајлиме да додате али тада губите слику историје пошто Субверзија незна фајлове на које се односи. " #. (para) #: ../source/TortoiseGit_en.xml:7376 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "Бољи начин је да се нотира Субверзија да су ове измене у ствари преименовања и можете то урадити у оквиру Урежи и Провери Модификацију дијалог. Једноставно изаберите старо име (недостаје) и ново име (неверзионисано) и користите Контекст МениПоправи Помери да упарите два фајла као преименовање." #. (title) @@ -6319,7 +6319,7 @@ msgstr "Брисање неверзионисаних фајлова" #. (para) #: ../source/TortoiseGit_en.xml:7391 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." msgstr "Обично подешавате листу занемаривања тако да су сви генерисани фајлви занемарени у Субверзији. Али шта ако желите да очистите све занемарене ставке да би израдили чисту градњу? Обично то подешавате у мејкфајлу али ако дебагујете мејкфајл или мењањем система изградње корисно је да се има начин чишћења платформе." #. (para) @@ -6414,12 +6414,12 @@ msgstr "чишћење" #. (para) #: ../source/TortoiseGit_en.xml:7493 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." msgstr "Ако Субверзиона команда не може да се заврши успешно, могуће због проблема на серверу, ваша радна копија биће остављена у неконзистентном стању. У том случају треба да користите ТортоисеСВНЧишћење на именику. То је добра идеја да се уради на вршном нивоу радне копије." #. (para) #: ../source/TortoiseGit_en.xml:7504 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." msgstr "Чишћење има и други пропратни ефекат. Ако је датум фајла промењен а садржај није, Субверзија не може рећи да ли је заиста измењен осим провером бајт-по-бајт са чистом копијом. Ако имате пуно фајлова у овом стању провера статуса је врло спора што ће урадити пуно дијалога споро одговарање. Извршавањем Чишћења на радној копији поправиће поремећене временске маркере и повратити статус провере пуном брзином." #. (title) @@ -6429,7 +6429,7 @@ msgstr "Користи временске маркере урезивања" #. (para) #: ../source/TortoiseGit_en.xml:7516 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." msgstr "Неке раније реализације Субверзије су имале баг који је узроковао онфликт временских маркера када их проверавате са Користи урезивање временских маркера провером опција. Користите Чишћење команду да убрзате ове радне копије. " #. (title) @@ -6444,37 +6444,37 @@ msgstr "особине" #. (title) #: ../source/TortoiseGit_en.xml:7532 -msgid "Explorer property page, Subversion tab" +msgid "Explorer property page, Git tab" msgstr "Власнички лист експлорера, Субверзиони таб" #. (para) #: ../source/TortoiseGit_en.xml:7530 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." msgstr " Понекад желите да имате детаљније информације о фајл/именик него што је прекривна икона. Можете добити све информације које Субверзија даје у дијалогу особина претраживача. Само изаберите фајл или именик и изаберите Виндоуз МениОсобине у контекст менију (примедба: то је нормалан мени особина улаз који даје претраживач, није део ТортоисеСВН субменија!). У дијалогу особина ТортоисеСВН додаје нову страну особина за фајлове/именике под Субверзијином контролом, где можете видети релевантне информације о изабраном фајлу/именику." #. (title) #: ../source/TortoiseGit_en.xml:7552 -msgid "Subversion Properties" +msgid "Git Properties" msgstr "Субверзионе особине" #. (primary) #: ../source/TortoiseGit_en.xml:7554 -msgid "Subversion properties" +msgid "Git properties" msgstr "Субверзионе особине" #. (title) #: ../source/TortoiseGit_en.xml:7560 -msgid "Subversion property page" +msgid "Git property page" msgstr "Субверзиони власнички лист" #. (para) #: ../source/TortoiseGit_en.xml:7558 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." msgstr " Можете читати и подесити Субверзионе особине из Виндоуз особине дијалога, али такође из ТортоисеСВНособине и у оквиру ТортоисеСВН статусне листе из Контекст мениособине." #. (para) #: ../source/TortoiseGit_en.xml:7575 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." msgstr "Можете додату ваше личне особине, или неке особине са специфичним значењем у Субверзији. То што почиње са svn:. svn:externals је таква особинач видите како се рукује екстерналима у xref linkend=\"tsvn-dug-import-4\"/>." #. (title) @@ -6519,17 +6519,17 @@ msgstr "Компримована комбинација претходне че #. (para) #: ../source/TortoiseGit_en.xml:7589 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "Субверзија подржава ЦВС-сличне проширење кључних речи које се могу користити да углаве фајлиме и ревизиону информацију у сам фајл. Кључне речи тренутно подржане су: " #. (para) #: ../source/TortoiseGit_en.xml:7640 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." msgstr "Да бисте нашли како да користите кључне речи погледајте на svn:keywords section у Субверзионој књизи, која вам даје пун опис ових кључних речи и како их омогућити и користити." #. (para) #: ../source/TortoiseGit_en.xml:7650 -msgid "For more information about properties in Subversion see the Special Properties." +msgid "For more information about properties in Git see the Special Properties." msgstr "Даље информације о свнсерву могу се наћи на Специјалне особине." #. (title) @@ -6634,12 +6634,12 @@ msgstr "ауто-особ" #. (para) #: ../source/TortoiseGit_en.xml:7768 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." msgstr "Можете конфигурисати Субверзију и ТортоисеСВН да подесите особине аутоматски на фајловима и именицима када се они додају у спремиште. Постоји два начина да се то уради." #. (para) #: ../source/TortoiseGit_en.xml:7773 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." msgstr "Можете уредити субверзиони конфигурациони фајл да омогућите ову особину на клијенту. Генерална страна ТортоисеСВН подешавања дијалог има дугме за уређење да га покренете директно. Конфиг фајл је једноставан текст фајл који контролише неке од субверзионих деловања. Потребно је да измените две ствари: најпре у заглављу параграфа асортиман откоментирајте линију enable-auto-props = yes. Друго, потребно је да уредите параграф испод да дефинише које особине желите да додате на који тип фајла. Овај метод је стандардна субверзиона особина и ради са било којим субверзионим клијентом. Међутим то је дефинисано код сваког клијента индивидуално - нема начина да се пренесе ово подешавање из спремишта." #. (para) @@ -6664,7 +6664,7 @@ msgstr "Урезивање особина" #. (para) #: ../source/TortoiseGit_en.xml:7810 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." msgstr "Субверзионе особине су верзионисане. После измена или додавања особина треба да урежете ваше измене." #. (title) @@ -6674,7 +6674,7 @@ msgstr "Конфликт у особинама" #. (para) #: ../source/TortoiseGit_en.xml:7817 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." msgstr "Ако постоји конфликт при урезивању измена, зато што други корисник има измењене исте особине, Субверзија генерише .prej фајл. Обришите овај фајл после разрешења конфликта." #. (title) @@ -6714,7 +6714,7 @@ msgstr "tsvn:logtemplate се користи са проје #. (para) #: ../source/TortoiseGit_en.xml:7882 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." msgstr "Субверзија вам омогућава да подесите autoprops који ће бити примењен на ново додате или увезене фајлове, засноване на екстензији фајла. Ово зависи на сваком клијенту који има подешен одговарајучи аутопропс у свом субверзионом конфигурационом фајлу. tsvn:autoprops може бити подешен на именику и то ће бити стопљено са корисничким локалним аутопропс када се увезу или додају фајлови. Формат је исти као и за субверзиони аутопропс, нпр. *.sh = svn:eol-style=native;svn:executable подешава две особине на фајловима са .sh екстензијом." #. (para) @@ -6801,7 +6801,7 @@ msgstr "Када додате нови суб-именик користећи Т #. (para) #: ../source/TortoiseGit_en.xml:8015 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." msgstr "Такође ТортоисеСВН особине пројекта су изузетно корисне, оне само раде са ТортоисеСВН, и неки ће само радити у новој верзији ТортоисеСВН. Ако људи раде на вашем пројекту користите мноштво Субверзионих клијената, или могуће ако имате стару верзију ТортоисеСВН, можете да користите закачаљке спремишта да форсирате политику пројекта. Особине пројекта могу помоћи да се примени политика, она се не може форсирати. " #. (title) @@ -6833,7 +6833,7 @@ msgstr "Друга особина система контроле верзија #. (para) #: ../source/TortoiseGit_en.xml:8058 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." msgstr "Субверзија нема специјалне команде за гранање и означавање, али користи такозване јефтине копије уместо. Јефтине копије су сличне чврстим везама на Јуниксу, које значе то да се уместо прављења комплетних копија у спремишту, интерна веза се креира, указујући на специфично стабло/ревизију. Као резултат гране и значке се врло брзо креирају, и скоро да не узимају додатни простор у спремишту." #. (title) @@ -6980,7 +6980,7 @@ msgstr "Ако измените радну копију креирану од г #. (para) #: ../source/TortoiseGit_en.xml:8245 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " msgstr "Такође, сама Субверзија не прави разлику између значки и грана, начин како се типично користе разликује се у малом. " #. (title) @@ -7006,7 +7006,7 @@ msgstr "Тамо где се гране користе да одржавају #. (para) #: ../source/TortoiseGit_en.xml:8299 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." msgstr "Важно је разумети како гране и стапање раде на Субверзији пре почетка њиховог коришћења, јер може бити сасвим комплексно. Јако се препоручује да прочитате поглавље Branching and Merging у Субверзионој књизи, која даје пун опис и много примера как се корист." #. (para) @@ -7036,7 +7036,7 @@ msgstr "Метода се користи у случају кад сте нап #. (para) #: ../source/TortoiseGit_en.xml:8342 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." msgstr "Како питате Субверзију да то уради: Израчунати измене неопходне да узмете [ОД] ревизије 1 гране A [ДО] ревизије 7 гране A, примените ове измене у мојој радној копији (дебло или грана B)." #. (term) @@ -7048,12 +7048,12 @@ msgstr "Реинтегриши грану" #. (para) #: ../source/TortoiseGit_en.xml:8353 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." msgstr "Овај метод покрива случај када сте урадили посебну грану што је разматрано у Субверзионој књизи. Све измене дебла су проведена у посебној грани, недеља по недељу, и сада је посебност комплетно оно што желите да стопите назад у дебло. Пошто хоћете да задржите посебну грану синхронизирану са деблом, задња верзија гране и дебла ће бити апсолутно идентичне осим за ваше измене гране." #. (para) #: ../source/TortoiseGit_en.xml:8362 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "Ово је специјални случај стапања стабла описан доле, и он захтева само УРЛ да стопи (нормално) вашу грану развоја. Користи праћење стапања особину Субверзије да израчуна исправни ревизиони опсег за коришћење, и омогућава додатну проверу која омогућава да је та грана потпуно ажурирана изменом дебла. Ово омогућава да ви не поништите гршком рад који су други урезали у дебло од ваше задње сихронизоване измене." #. (para) @@ -7073,12 +7073,12 @@ msgstr "Стопи два различита стабла" #. (para) #: ../source/TortoiseGit_en.xml:8392 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." msgstr "Ово је много општији случај реинтеграционог метода. Оно што питате Субверзију да то уради је: Израчунајте измене неопходне да добијете [ОД] главне ревизије дебла [ДО]главне ревизије гране,и применити те измен на моју радну копију (дебла). чист резултат је то дебло сада изгледа тачно као грана." #. (para) #: ../source/TortoiseGit_en.xml:8400 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." msgstr "Ако ваш сервер/спремиште не подржава стапање-праћење онда је ово једини начин да се стопи грана назад у дебло. Следећи случај коришћења се јавља када користите продајне гране и потребно вам је да стопите измене које прате нови продајни пад у ваш код дебла.За више информација прочитајте поглавље vendor branches у Субверзионој кљизи." #. (title) @@ -7123,7 +7123,7 @@ msgstr "Са ТортоисеСВН ви специфицирате изменљ #. (para) #: ../source/TortoiseGit_en.xml:8463 -msgid "If you are merging revisions in chunks, the method shown in the subversion book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." +msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." msgstr "Ако стапате ревизије у кришкама, приказан метод у субверзионој књизи ће стопити 100-200 сада и 200-300 после. Са ТортоисеСВН стопићете 100-200 сада и 201-300 после." #. (para) @@ -7148,7 +7148,7 @@ msgstr "Ако сте већ стопили неке измене из ове г #. (para) #: ../source/TortoiseGit_en.xml:8508 -msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." msgstr "Ако користите праћење стапања особину Субверзије, не треба вам да памтите које ревизије су већ стопљене - Субверзија бележи то за вас. Ако оставите ревизиони опсег празним, све ревизије које још нисте стопили биће укључене. Прочитајте да нађете више о томе." #. (para) @@ -7243,7 +7243,7 @@ msgstr "Морате одредити дубину коју ћете корис #. (para) #: ../source/TortoiseGit_en.xml:8618 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" msgstr "Највише времена ви желите да стапање узме у обзир историју фајла, тако да измене релативне заједничком претходнику су стопљене. Понекад вам је потребно да стопите фајлове који можда зависе, али нису у вашем спремишту. На пример можда сте увезли верзије 1 и 2 библиотеке трећег лица у два одвојена именика.Такође, они су логички зависни, Субверзија нема знања о томе јер само види лопту коју унесете. Ако покушате да стопите разлике та два стабла видећете комплетно уклањање коме следи комплетно додавање. Да учините да Субверзија користи само засноване на путањи разлике пре него историјски-засноване разлике, чекирајте guilabel>Занемари порекло бокс. Прочитајте више о овоме у Субверзионој књизи, Noticing or Ignoring Ancestry" #. (para) @@ -7278,12 +7278,12 @@ msgstr "Стапање је сада комплетно. Добра је иде #. (para) #: ../source/TortoiseGit_en.xml:8679 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." msgstr "За Субверзионе клијенте и сервере пре 1.5, нису стопи информације ускладиштене и стопљене ревизије су праћене ручно. Када сте тестирали измене и дошли до урезивања ове ревизије, ваш дневник порука урезивања треба увек да обухвати ревизионе бројеве који су пренети у стапању. Ако желите да примените следеће стапање касније потребно вам је да знате шта сте већ стопили, јер не желите да пренесете измене више него једном. За више информација о томе погледајте Best Practices for Merging у Субверзијиној књизи." #. (para) #: ../source/TortoiseGit_en.xml:8696 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "Ако ваш сервер и сви клијенти раде Субверзију 1.5 или вишу, праћење стапања могућност ће забележити ревизије стољене и изоставити ревизије које су стопљене више од једанпут. Ово чини ваш живот много једноставнијим као кад једноставно стопите цели ревизиони опсег сваки пут и знате да само нова ревизија ће стварно бити стопљена." #. (para) @@ -7298,7 +7298,7 @@ msgstr "Ако сте управо стопили посебну грану на #. (para) #: ../source/TortoiseGit_en.xml:8718 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." msgstr "Субверзија не може стопити фајл са имеником и обратно - само именици са именицима и фајлови са фајловима. Ако кликнете на фајл и отворите дијалог стапања, затим можете задати путању до фајла у дијалогу. Ако изаберете и покренете дијалог морате специфицирати именик УРЛ за стапање." #. (title) @@ -7338,7 +7338,7 @@ msgstr "Можете обележити ревизију као не #. (para) #: ../source/TortoiseGit_en.xml:8732 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " msgstr "Субверзија 1.5 уводи могућност за праћење стапања. Када се ваше стапање мења са једног стабла на друго, ревизиони бројеви стопљени су ускладиштени и та информација може бити коришћена за више различитих сврха. " #. (para) @@ -7348,8 +7348,8 @@ msgstr "Праћење стапања информација је усклади #. (para) #: ../source/TortoiseGit_en.xml:8784 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." -msgstr "Нађите више о праћењу стапања из Субверзионе Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." +msgstr "Нађите више о праћењу стапања из Субверзионе Merge tracking documentation." #. (title) #: ../source/TortoiseGit_en.xml:8792 @@ -7463,17 +7463,17 @@ msgstr "Ваша компанија је увек користила закљу #. (para) #: ../source/TortoiseGit_en.xml:8918 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " msgstr "Субверзија генерално ради најбоље без закључавања, користећи Копирај-Измени-Стопи методе описане раније у . Ипак, постоји неколико примера када можете имати потребу да примените неку врсту политике закључавања. " #. (para) #: ../source/TortoiseGit_en.xml:8942 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." msgstr "Најпре треба обезбедити да Субверзиони сервер дограђен најмање на верзију 1.2. Раније верзије уопште не подржавају закључавање. Ако користите file:// приступ, свакако само ваш клијент треба да буде ажуриран." #. (title) #: ../source/TortoiseGit_en.xml:8949 -msgid "How Locking Works in Subversion" +msgid "How Locking Works in Git" msgstr "Како закључавање ради на Субверзији" #. (para) @@ -7488,7 +7488,7 @@ msgstr "Ако ви Ставите Катанац на ф #. (para) #: ../source/TortoiseGit_en.xml:8963 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." msgstr "Међутим, други корисници неће неопходно знати да сте уклонили катанац. Осим да провере статус закључавања регуларно, најпре они морају знати о томе када урезивање уткаже, што у већини случајева није много крисно. Да бисте учинили то лакшим за манипулацију постоји нова Субверзиона особина svn:needs-lock. Када је ова особина подешена (на било коју вредност) на фајлу, кадгод се фајл преузима или ажурира, локална копија постаје само за читање осим ако та радна копија држи катанац за фајл. Ово делује као упозорење тако да не можете уређивати тај фајл осим ако најпре не добијете катанац. Фајлови који су верзионисани и само за читање означени су специјалним прекривачем у ТортоисеСВН да укажу да треба да добијете катанац пре уређења." #. (para) @@ -7498,7 +7498,7 @@ msgstr "Закључавање је уписано у локацији радн #. (para) #: ../source/TortoiseGit_en.xml:8985 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." msgstr "Ако један од ваших сарадника тражи катанац и оде на одмор без откључавања шта да се ради? Субверзија омогућава начин да се форсира закључавање. Откључавање од још неког означено је као Разбијање катанца, а насилно откључавање које неко уради зове се Крађа катанца. Природно, ово нису ствари које треба да радите олако ако желите да останете пријатељ са сарадницима" #. (para) @@ -7568,7 +7568,7 @@ msgstr "Избегавање разбијања и крађа катанца" #. (para) #: ../source/TortoiseGit_en.xml:9086 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." msgstr "Ако сломите или украдете неком другом катанац без питања можете потенцијално узроковати губитак посла. Ако радите са нестопивим типом фајлва и неком украдете катанац када вратите катанац они су слободни да провере своје измене и прекрију ваше. Субверзија не губи податке али ви можете изгубити радну заштиту тима које ва закључавање омогућава." #. (title) @@ -7583,7 +7583,7 @@ msgstr "Како је напоменуто горе, много ефективн #. (para) #: ../source/TortoiseGit_en.xml:9109 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." msgstr "Ако радите са политиком да сваки фајл може бити закључан тада можда схватите да је лакше да користите Субверзиону суто-пропс особину да подесите особине аутоматски сваки пут кад додајете нови фајл. Прочитајте за даље информације." #. (title) @@ -7593,7 +7593,7 @@ msgstr "Закачиве скрипте за закључавање" #. (para) #: ../source/TortoiseGit_en.xml:9119 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." msgstr "Када креирате ново спремиште са Субверзијом 1.2 или вишом, четири модела закачаљки се креира у спремишту закачаљке именик.Оне се позивају пре и после постављања катанца и пре и после скидања катанца." #. (para) @@ -8260,7 +8260,7 @@ msgstr "Можете такође стопити измене у изабран #. (para) #: ../source/TortoiseGit_en.xml:9967 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." msgstr "Зато што Субверзија не може обезбедити све информације које се траже известан део интерпретације је потребан,који понекад даје чудне рзултате. Ипак, излаз за дебло ће генерално дати користан резултат." #. (para) @@ -8275,7 +8275,7 @@ msgstr "Ако користите дневник кеш и мислите да #. (title) #: ../source/TortoiseGit_en.xml:9996 -msgid "Exporting a Subversion Working Copy" +msgid "Exporting a Git Working Copy" msgstr "Извоз Субверзионе радне копије" #. (primary) @@ -8330,7 +8330,7 @@ msgstr "Извоз појединачног фајла" #. (para) #: ../source/TortoiseGit_en.xml:10071 -msgid "The export dialog does not allow exporting single files, even though Subversion can." +msgid "The export dialog does not allow exporting single files, even though Git can." msgstr "Извозни дијалог не допушта извоз појединачних фајлова, без обзира што Субверзија може." #. (para) @@ -8427,7 +8427,7 @@ msgstr "Ово је веома ретко коришћена опер #. (para) #: ../source/TortoiseGit_en.xml:10171 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." msgstr "Хоћете да померите различита Субверзиона спремишта. У том случају треба да извршите чисто преузимање из нове локације спремишта." #. (para) @@ -8472,7 +8472,7 @@ msgstr "багтрагач" #. (para) #: ../source/TortoiseGit_en.xml:10211 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." msgstr "Веома је често у Развоју Софтвера за измене да имају специфичне багове или проблем ИД. Корисници баг трагач система (проблем трагач) су волели да придруже измене које су направили у Субверзији са специфичним ИД у њиховом проблем трагачу. Већина проблем трагача због тога омогућавају пре-урезивања закачиве скрипте које анализирају дневник поруке да нађу баг ИД са којим је урезивање повезано. Ово је понекад склоно грешкама одкад је потребно да корисник упише дневник поруку исправно тако да преурезивања закачив скрипт може га анализирати коректно." #. (para) @@ -8653,12 +8653,12 @@ msgstr "Нема Проблем Трагач Информације из Пре #. (para) #: ../source/TortoiseGit_en.xml:10518 -msgid "Because the issue tracker integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "Зато што проблем трагач интеграција зависи од приступа субверзионих особина, ви ћете само видети резултате када користите преузету радну копију. Добављање особина даљински је споро, тако не можете видети ову особину у акцији репо претраживача." #. (para) #: ../source/TortoiseGit_en.xml:10525 -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." msgstr "Проблем трагач интеграција није ограничена на ТортоисеСВН; то може бити коришћено са било којим Субверзионим клијентом. За више информација прочитајте потпуније Проблем Трагач Интеграција Спецификација у ТортоисеСВН изворно спремиште. ( објашњава како да приступите спремишту)." #. (title) @@ -8713,7 +8713,7 @@ msgstr "ВебСВН" #. (para) #: ../source/TortoiseGit_en.xml:10588 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." msgstr "Постоји више веб-заснованих прегледача спремишта доступних за коришћење као ПрегледајВЦ and ViewVC and WebSVNВебСВН. ТортоисеСВН омогућава начин да повежете са овим прегледачем." #. (para) @@ -8743,7 +8743,7 @@ msgstr "Нема Репо Прегледач Веза из Претражива #. (para) #: ../source/TortoiseGit_en.xml:10684 -msgid "Because the repo viewer integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "Зато што проблем трагач интеграција зависи од приступа субверзионих особина, ви ћете само видети резултате када користите преузету радну копију. Добављање особина даљински је споро, тако не можете видети ову особину у акцији репо претраживача." #. (title) @@ -8778,7 +8778,7 @@ msgstr "Дијалог подешавања, општа страница" #. (para) #: ../source/TortoiseGit_en.xml:10710 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." msgstr " Овај дијалог омогућава да одредите свој жељени језик, и Субверзионо-специфучна подешавања." #. (term) @@ -8848,12 +8848,12 @@ msgstr "Глобални модели занемаривања су коришћ #. (para) #: ../source/TortoiseGit_en.xml:10792 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." msgstr "Приметимо да се модели занемаривања које сте овде специфицирали такође утичу на остале Субверзионе клијенте који раде на вашем ПЦ, укључујући клијенте командне линије." #. (para) #: ../source/TortoiseGit_en.xml:10798 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." msgstr "Ако користите Субверзиони конфигурациони фајл да подесите global-ignores модел, то ће премостити подешавање које сте овде урадили. Субверзиони конфигурациони фајл је контактиран коришћењем Уреди како је објашњено у даљем тексту." #. (para) @@ -8873,12 +8873,12 @@ msgstr "Ова опција каже ТортоисеСВН да подеси д #. (term) #: ../source/TortoiseGit_en.xml:10834 -msgid "Subversion configuration file" +msgid "Git configuration file" msgstr "Субверзијин конфигурациони фајл" #. (para) #: ../source/TortoiseGit_en.xml:10836 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." msgstr "Користите Уреди да уредите Субверзиони конфигурациони фајл директно. нека подешавање се не могу изменити са ТортоисеСВН, и траже да уместо тога буду подешена овде. За више информација о Субверзионом конфиг фајлу видите Runtime Configuration Area. Поглавље на Automatic Property Setting је од посебног интереса, и оно је конфигурисано овде. Приметимо да Субверзија може читати конфигурационе информације са више места , и потребно је да знате који има приоритет. Упоредите са Configuration and the Windows Registry да нађете више о томе." #. (term) @@ -8888,12 +8888,12 @@ msgstr "Користите _svnуместо .svn< #. (para) #: ../source/TortoiseGit_en.xml:10863 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." msgstr "ВС.НЕТ када се користи са веб пројектима не може да рукује са .svn именицима које Субверзија користи да смешта интерне информације. Ово није баг у Субверзији. Баг је у ВС.НЕТ и предњој страни коју користи. Прочитајте да нађете више о овом проблему." #. (para) #: ../source/TortoiseGit_en.xml:10870 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." msgstr "Ако желите да измените понашање Субверзије и ТортоисеСВН, можете користити чекбокс да подесите променљиве околине које то контролишу." #. (para) @@ -8993,7 +8993,7 @@ msgstr "Ауто-затварање ако нема конфликта #. (para) #: ../source/TortoiseGit_en.xml:10993 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." msgstr "Ауто-затварање ако нема грешака увек затвара дијалог чак и ако је био конфликата. Једини услов који држи отворен дијалог је услов грешке, што се јавља када је Субверзија омогућенада комплетира задатак. На пример, ажурирање је неуспешно зато што је сервер недоступан, или урезивање је неуспешно зато што је радна копија застарела." #. (term) @@ -9363,13 +9363,13 @@ msgstr "Искључи Путање се користи д #. (para) #: ../source/TortoiseGit_en.xml:11407 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "f:\\development\\SVN\\Subversion ће онемогућити прекриваче само на специфичном именику. Ви још можете видети прекриваче на свим фајловима унутар именика." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "f:\\development\\SVN\\Git ће онемогућити прекриваче само на специфичном именику. Ви још можете видети прекриваче на свим фајловима унутар именика." #. (para) #: ../source/TortoiseGit_en.xml:11412 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "f:\\development\\SVN\\Subversion* ће онемогућити прекриваче на све фајлове и именике чије путање почињу са f:\\development\\SVN\\Subversion. То значи да ви желите да видите прекриваче за сваки фајл и именик испод путање." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "f:\\development\\SVN\\Git* ће онемогућити прекриваче на све фајлове и именике чије путање почињу са f:\\development\\SVN\\Git. То значи да ви желите да видите прекриваче за сваки фајл и именик испод путање." #. (para) #: ../source/TortoiseGit_en.xml:11419 @@ -9471,7 +9471,7 @@ msgstr " Овде можете конфигурисат ваш #. (para) #: ../source/TortoiseGit_en.xml:11514 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." msgstr "Ако вам је потребно да подесите по-спремишту прокси подешавања, потребно је да користите Субверзиони сервер фајл да конфигурише ово. Користи Уреди да добијеш то директно. Консултујте Runtime Configuration Area за детаље како користити овај фајл." #. (para) @@ -9507,8 +9507,8 @@ msgstr "Да би избегли да будете питани за лозин #. (para) #: ../source/TortoiseGit_en.xml:11564 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." -msgstr "На крају, подешавање ССХ на серверу и клијентима је не-тривијалан процес који је ван интереса овог фајла помоћи. Међутим, можете наћи водич у ТортоисеСВН ЧПП излистаних под Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." +msgstr "На крају, подешавање ССХ на серверу и клијентима је не-тривијалан процес који је ван интереса овог фајла помоћи. Међутим, можете наћи водич у ТортоисеСВН ЧПП излистаних под Git/TortoiseGit SSH How-To." #. (title) #: ../source/TortoiseGit_en.xml:11574 @@ -9603,7 +9603,7 @@ msgstr "Ако користите svn:keywords особину #. (para) #: ../source/TortoiseGit_en.xml:11680 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." msgstr "Можете такође специфирати различит дифф алат да користе Субверзионе особине. Како ово тежи да буде скраћен једноставан текст стринг, ви можете желети једноставно много компактнији преглед." #. (para) @@ -9780,7 +9780,7 @@ msgstr "Аутентификациони податак" #. (para) #: ../source/TortoiseGit_en.xml:11913 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" msgstr "Када се аутентификујете на Субверзиони сервер, корисничко име и лозинка се кеширају локално тако да не морате да их уносите. Можете желети да обришете ово из сигурносних разлога, или зато што желите да приступите спремишту под другим корисничким именом ... да ли Џон зна да ви користите његов ПЦ?" #. (para) @@ -10020,7 +10020,7 @@ msgstr "Дијалог подешавања, Закачив скрипт стр #. (para) #: ../source/TortoiseGit_en.xml:12154 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." msgstr " Овај дијалог омогућава да подесите закачиве скрипте које ће се извршити аутоматски када се извесне Субверзионе акције извршавају. Супротно закачивим скриптама објашњеним у , ове скрипте се извршавају локално на клијенту." #. (para) @@ -10100,7 +10100,7 @@ msgstr "Пре-ажурирај" #. (para) #: ../source/TortoiseGit_en.xml:12228 -msgid "Called before the actual Subversion update begins." +msgid "Called before the actual Git update begins." msgstr "Позивана пре него актуелно Субверзоно ажурирање почне. " #. (term) @@ -10212,7 +10212,7 @@ msgstr "Приметимо такође да имамо дата имена ти #. (para) #: ../source/TortoiseGit_en.xml:12406 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." msgstr "Ако желите да Субервезионе операције држе искључено све док се закачаљка комплетира, проверите Чекајте док скрипт заврши." #. (para) @@ -10322,7 +10322,7 @@ msgstr "Сасвим ретко коришћена подешавања су о #. (para) #: ../source/TortoiseGit_en.xml:12533 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." msgstr "Можете специфицирати различиту локацију за Субверзиони конфигурациони фајл користећи регистри локацију HKCU\\Software\\TortoiseGit\\ConfigDir. Ово ће утицати на све ТортоисеСВН операције." #. (term) @@ -10387,7 +10387,7 @@ msgstr "Дневник дијалог осветљава текућу ревиз #. (title) #: ../source/TortoiseGit_en.xml:12623 -msgid "Subversion Working Folders" +msgid "Git Working Folders" msgstr "Субверзиони Радни Именици" #. (primary) @@ -10402,7 +10402,7 @@ msgstr "_свн именик" #. (para) #: ../source/TortoiseGit_en.xml:12630 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." msgstr "ВС.НЕТ 2003 када се користи са веб пројектима не може руковати са .svn именицима које Субверзија користи да смести интерне информације. Ово није баг у Субверзији. Баг је у ВС.НЕТ 2003 и улазне странице које користи као проширење." #. (para) @@ -10412,7 +10412,7 @@ msgstr "Приметимо да је баг фиксиран у ВС2005 и да #. (para) #: ../source/TortoiseGit_en.xml:12641 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." msgstr "Од Верзије 1.3.0 Субверзије и ТортоисеСВН, можете подесити променљиву окружења SVN_ASP_DOT_NET_HACK. Ако је та променљива подешена Субверзија ће користити _svn именик уместо .svn именик. Морате рестартовати вашу шкољку за ту променљиву околине да постане ефектна. Нормално то значи ребутовање ПЦ. Да се то олакша, можете сада урадити то са странице генералног подешавања користећи једноставан чекбокс - обратите се на ." #. (para) @@ -10467,7 +10467,7 @@ msgstr "број верзије у фајловима" #. (para) #: ../source/TortoiseGit_en.xml:12702 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." msgstr "SubWCRev је Виндоуз конзолни програм који се може користити да се прочита статус Субверзионе радне копије и омогући замена кључних речи у фајл моделу. Ово се често користи као део процеса израде у значењу уношења информације радне копије у објекат који израђујете. Типично то може бити коришжено да се укључи ревизиони број у Опис програма бокс." #. (title) @@ -10477,7 +10477,7 @@ msgstr "СубВЦРев командна линија" #. (para) #: ../source/TortoiseGit_en.xml:12717 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." msgstr "SubWCRev чита Субверзиони статус свих фајлова у радној копији, изостављајући спољашње уобичајено. Записује највећи нађен број урезане ревизије, и временску ознаку урезивања те ревизије. Такође записује да ли постоје локалне измене у радној копији, или помешано ажуриране ревизије. Ревизиони број, опсег ажурирања ревизија и статус измена су приказани на стдоут." #. (para) @@ -10975,7 +10975,7 @@ msgstr "Порука унета када је катанац креиран." #. (para) #: ../source/TortoiseGit_en.xml:13031 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " msgstr "Ако треба да приступите Субверзијиној ревизиојиној информацији из других програма, можете користити ЦОМ интерфејс SubWCRev. Објекат који се креира је literal>SubWCRev.object, и следећи методи су подржани: " #. (programlisting) @@ -11253,8 +11253,8 @@ msgstr "ЧПП" #. (para) #: ../source/TortoiseGit_en.xml:13237 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "Пошто се ТортоисеСВН развија све време понекад је тешко да се документација држи ажурно. Ми одржавамо online FAQ који садржи избор питања која су највише постављана на ТортоисеСВН мејлинг листама dev@TortoiseGit.tigris.org и users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "Пошто се ТортоисеСВН развија све време понекад је тешко да се документација држи ажурно. Ми одржавамо online FAQ који садржи избор питања која су највише постављана на ТортоисеСВН мејлинг листама tortoisegit-dev@googlegroups.com и tortoisegit-users@googlegroups.com ." #. (para) #: ../source/TortoiseGit_en.xml:13249 @@ -11263,8 +11263,8 @@ msgstr "Такође подржавамо пројекат users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." -msgstr "Ако имате питање на које није одговорено било где другде, најбоље место да питате је једна од мејлинг листи. users@TortoiseGit.tigris.org је једна да служи ако имате питања о коришћељу ТортоисеСВН. Ако желите помоћ у развоју ТортоисеСВН, треба да узмете учешће у дискусији на dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." +msgstr "Ако имате питање на које није одговорено било где другде, најбоље место да питате је једна од мејлинг листи. tortoisegit-users@googlegroups.com је једна да служи ако имате питања о коришћељу ТортоисеСВН. Ако желите помоћ у развоју ТортоисеСВН, треба да узмете учешће у дискусији на tortoisegit-dev@googlegroups.com ." #. (title) #: ../source/TortoiseGit_en.xml:13275 @@ -11323,7 +11323,7 @@ msgstr "празна порука" #. (para) #: ../source/TortoiseGit_en.xml:13340 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." msgstr "Постоји два начина да се спрече корисници да урезују са празном дневник поруком. Један је специфичан за ТортоисеСВН, други ради за све Субверзионе клијенте, али захтева приступ серверу директно." #. (title) @@ -11343,7 +11343,7 @@ msgstr "У именику спремишта на серверу постоји #. (para) #: ../source/TortoiseGit_en.xml:13362 -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." msgstr "Овај метод је препоручен начин ако ваш корисник такође користи друге Субверзионе клијенте осим ТортоисеСВН. Неугоднодт је да је урезивање одбијено од сервера и тада корисник добија поруку о грешци. Клијент не може знати пре урезивања да ће бити одбијен. Ако желите да учините ТортоисеСВН да има OK дугме онемогућено док дневник порука не буде довољно дугачка користите метод описан доле." #. (title) @@ -11490,7 +11490,7 @@ msgstr "Пошто ТортоисеСВН никад не губи податк #. (para) #: ../source/TortoiseGit_en.xml:13563 -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." msgstr "Једини начин да се избаце подаци из спремишта је да се алат Субверзионе командне линије svnadmin. Можете наћи опис како ово ради у Одржавање спремишта." #. (title) @@ -11555,7 +11555,7 @@ msgstr "Подесите svn:externals карактерист #. (para) #: ../source/TortoiseGit_en.xml:13657 -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." msgstr "Урежите нови именик. Сада када ажурирате, Субверзија ће вући копију пројекта из спремишта у вашу радну копију. Под-именици ће бити креирани аутоматски ако се захтева. Сваки пут када ажурирате вашу главну радну копију, ви ћете такође добити задњу верзију свих спољашњих пројеката." #. (para) @@ -11570,7 +11570,7 @@ msgstr "Користи угњеждену радну копију" #. (para) #: ../source/TortoiseGit_en.xml:13685 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" msgstr "Креирајте нови именик у оквиру вашег пројекта да садржи заједничке кодове, али не додајте то Субверзији." #. (para) @@ -12155,7 +12155,7 @@ msgstr "Пошто су све команде ТортоисеСВН контр #. (para) #: ../source/TortoiseGit_en.xml:14192 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." msgstr "Запамтите да је ТортоисеСВН ГУИ клијент, и овај аутоматизациони водич приказује како да учините да се ТортоисеСВН дијалог појави да сакупи корисникове улазе. Ако желите да напишете скрипт који не захтева улаз, треба да користите званичан Субверзиони линијски клијент уместо тога." #. (title) @@ -12777,17 +12777,17 @@ msgstr "ЦЛИ" #. (para) #: ../source/TortoiseGit_en.xml:14786 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." msgstr "Понекад ово упутство указује на главне Субверзионе документе, који описују Субверзију у терминима Интерфејса Командне Линије (ИКЛ). Да би вам се помогло да разумете шта ТортоисеСВН ради иза сцене саставили смо листу која показује еквивалентне ИКЛ команде за сваки ТортоисеСВН ГУИ." #. (para) #: ../source/TortoiseGit_en.xml:14795 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." msgstr "Без обзира што постоји ИКЛ еквивалент на оно што ТортоисеСВН ради сетите се да ТортоисеСВН не позива ИКЛ већ користи Субверзиону библиотеку директно." #. (para) #: ../source/TortoiseGit_en.xml:14801 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." msgstr "Ако мислите да сте нашли баг у ТортоисеСВН, можемо вам затражити да покушате да репродукујете то користећи ИКЛ, тако да можемо раздвојити ТортоисеСВН одзив од Субверзионог одива. Ове референце вам кажу са којим командама да покушате. " #. (title) @@ -12851,7 +12851,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14859 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." msgstr "Ажурирањем вишеструких ставки тренутно није атомик операција у Сбверзији. ТортоисеСВН прво нађе ГЛАВНУ ревизију спремишта, затим ажурира све ставке ка том посебном ревизионом броју да избегне радну копију помешаних ревизија." #. (para) @@ -12888,7 +12888,7 @@ msgstr "Ако је Само ажурирај вршни именик< #. (para) #: ../source/TortoiseGit_en.xml:14894 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." msgstr "У ТортоисеСВН, дијалог урезивања користи више Субверзионих команди. Први период је провера статуса која одређује ставке у вашој радној копији које могу бити потенцијално урезање. Можете вратити листу, дифф фајлови насупрот ОСНОВЕ и изабрати ставке које желите да буду укључене у урезивање." #. (screen) @@ -12909,7 +12909,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14904 #: ../source/TortoiseGit_en.xml:14992 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." msgstr "Ако је Прикажи неверзионисане фајлове чекирано, ТортоисеСВн ће такође приказати све неверзионисане фајлове и именике у хијерархији радне копије, узимајући у обзир правила занемаривања. Ова посебна особина нема директни еквивалент у Субверзији, као што < literal>svn status команда не силази у неверзионисане именике." #. (para) @@ -12931,7 +12931,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14919 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." msgstr "Када кликнете ОК, Субверзионо урезивање почиње. Ако оставите све селекционе чекбоксове фајлова у њиховом уобичајеном стању, ТортоисеСВН користи једно рекурзивно урезивање радне копије. Ако деселектујете неке фајлове, онда не-рекурзивно урезивање (-N) мора да буде узето, и свака путања мора бити специфицирана индивидуално у командној линији урезивања." #. (screen) @@ -13118,7 +13118,7 @@ msgstr "Први степен је провера статуса која одр #. (para) #: ../source/TortoiseGit_en.xml:15072 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." msgstr "Када кликнете ОК, Субверзионо враћање се дешава. Ако оставите избор фајлова чекбокс у уобичајеном статусу, ТортоисеСВН користи појединачно рекурзивно (-R) враћање радне копије. Ако деселектујете неке фајлове, онда свака путања мора бити специфицирана индивидуално у командној линији враћања. " #. (screen) @@ -13273,7 +13273,7 @@ msgstr "Овај облик се користи када се приступа #. (para) #: ../source/TortoiseGit_en.xml:15174 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." msgstr "Извозом радне копије у различиту локацију дато је без коришћења Субверзионе библиотеке, тако да нема одговарајућег еквивалента командне линије." #. (para) @@ -13384,7 +13384,7 @@ msgstr "ТортоисеСВН креира фајл закрпу у уједи #. (para) #: ../source/TortoiseGit_en.xml:15260 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." msgstr "Примена закрпа је трик посао све док закрпа и радна копија су исте ревизије. Срећом за вас, можете користити ТортоисеМерге, који нема директни еквивалент у Субверзији." #. (title) @@ -13404,7 +13404,7 @@ msgstr "приоритет прекривања" #. (para) #: ../source/TortoiseGit_en.xml:15289 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." msgstr "Сваки фахл и именик има Субверзиону статусну вредност како је објашњено у Субверзионој библиотеци. У клијентима командне линије, ово је претстављено једним словом кода, али ТортоисеСВН га приказује графички користећи прекривач икону. Пошто је број прекривача ограничен, сваки прекривач може престављати једну од више статусних вредности." #. (para) @@ -13429,12 +13429,12 @@ msgstr "Додат The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." -msgstr " У Субверзију прекривач се користи да прикаже ставку која је у нормалномl стању, или верзионисана ставка чије стање није познато. Пошто ТортоисеСВН користи позадински кешинг процес уједини статус то може узети неколико секунди пре него се прекривач ажурира." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgstr " У Субверзију прекривач се користи да прикаже ставку која је у нормалномl стању, или верзионисана ставка чије стање није познато. Пошто ТортоисеСВН користи позадински кешинг процес уједини статус то може узети неколико секунди пре него се прекривач ажурира." #. (para) #: ../source/TortoiseGit_en.xml:15340 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." msgstr " Тражи Катанац прекривач се користи да означи када фајл има svn:needs-lock особину подешену. За радне копије које су креиране коришћењем Субверзије 1.4.9 и даље, svn:needs-lock статус је кеширан локално помоћу Субверзије и он се користи да одреди када да прикаже овај прекривач. За радне копије које су у пре-1.4.х формату, ТортоисеСВН приказује овај прекривач када фајл има само-читање статус. Приметимо да Субверзија аутоматски дограђује радне копије када их ажурирате, такође кеширање svn:needs-lock особине се можда неће десити док сам фајл није ажуриран." #. (para) @@ -13454,12 +13454,12 @@ msgstr " Неверз #. (para) #: ../source/TortoiseGit_en.xml:15375 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "Ако ставка има субверзиони статус ниједан (ставка није у радној копији) прекривач онда неће бити приказан за те фајлове." #. (para) #: ../source/TortoiseGit_en.xml:15382 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "Ставка може имати само једну Субверзиону статусну вредност. На пример фајл може бити локално измењен и може бити означен за брисање у исто време. Субверзија враћа јединичну статусну вредност - у овом случају обрисан. Ови приоритети су дефинисани самом Субверзијом." #. (para) @@ -13504,23 +13504,23 @@ msgstr "Осигурање Свнсерва користећи ССХ" #. (para) #: ../source/TortoiseGit_en.xml:15452 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." msgstr "Ово поглавље обезбеђује корак-по-корак водич за подешавање Субверзије и ТороисеСВН да користе svn+ssh протокол. Ако већ користите аутентификовану ССХ везу да се логујете на сервер, онда сте већ ту и можете наћи више детаља у Субверзионој књизи. Ако не користите ССХ али бисте желели да то радите да би заштитили вашу инсталацију Субверзије, овај водич вам даје једноставан метод који не обухвата креирање посебног ССХ корисничког налога на серверу за сваког Субверзионог корисника." #. (para) #: ../source/TortoiseGit_en.xml:15462 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." msgstr "У овој примени креирамо појединачног ССХ корисника за све субверзионе кориснике, и користимо различите аутентификационе кључеве да направимо разлику између правих Субверзионих корисника." #. (para) #: ../source/TortoiseGit_en.xml:15467 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "У овом додатку узимамо да већ имате субверзиони алат инсталиран, и имате креирано спремиште како је детаљно објашњено негде у овом упутству. Приметимо да не треба покренути свсерв као сервис или даемон када га користите са ССХ." #. (para) #: ../source/TortoiseGit_en.xml:15473 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" -msgstr "Много од информација овде долази од Марк Логемана, које се могу наћи на www.logemann.org Додатне информације о подешавању Виндоуз сервера обезбедио је Торстон Милер. Хвала људи!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgstr "Много од информација овде долази од Марк Логемана, које се могу наћи на www.logemann.org Додатне информације о подешавању Виндоуз сервера обезбедио је Торстон Милер. Хвала људи!" #. (title) #: ../source/TortoiseGit_en.xml:15484 @@ -13540,7 +13540,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15494 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." msgstr "Да приметимо један моменат ако градите Субверзију од изворног кода и не обезбедите неки аргумент за ./configure, Субверзија креира bin именик под /usr/local и смешта своје бинарно стабло овде. Ако желите да користите тунел мод са ССХ, морате водити рачуна да корисничко логовање преко ССХ тражи да се изврши свнсерв програм и неки од бинарних. Због овог разлога, или сместите /usr/local/bin у PATH променљиву или креирајте симболичку везу ваших бинарних програма са /usr/sbin имеником, или ка неком другом именику који је обично у PATH." #. (para) @@ -13702,7 +13702,7 @@ msgstr "Тестирање ССХ са ТортоисеСВН" #. (para) #: ../source/TortoiseGit_en.xml:15657 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "Тако сад имамо само да тестирамо то да се можете логовати користећи ССХ. Сада нам је потрено да осигурамо да ССХ веза може стварно извршавати свнсерве. На серверу измените /home/svnuser/.ssh/authorized_keys како следи да омогућите да многи субверзиони аутори користе исти систем налог, svnuser. Приметимо да сваки субверзиони аутор користи исти логин али различит аутентификациони кључ, тако да имате да додате једну линију за саког аутора." #. (para) @@ -13822,7 +13822,7 @@ msgstr "Појмовник" #. (para) #: ../source/TortoiseGit_en.xml:15809 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "Субверзиона команда се користи да дода фајл или именик у вашу радну копију. Нова ставка је додата у спремиште када урезујете." #. (glossterm) @@ -13857,22 +13857,22 @@ msgstr "Грана" #. (para) #: ../source/TortoiseGit_en.xml:15851 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "Термин често коришћен у контролнм систему ревизија да опише шта се дешава када се развој раздвоји у некој тачци и прати 2 одвојене путање. Можете креирати грану ван главне развојне линије тако као да развијате нове особине без да учините главну линију нестабилном. Или можете гранати стабилну реализацију за коју ћете само фиксирати багове, док нови развој наставља на нестабилном дебл. У Субверзији грана се имплементира као јефтина копија." #. (para) #: ../source/TortoiseGit_en.xml:15866 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "Субверзиона команда која креира локалну радну копију у празном именику скидањем верзионисаних фајлова из спремишта." #. (para) #: ../source/TortoiseGit_en.xml:15875 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "Цитат из Субверзионе књиге: Рекурзивно чишћење радне копије, уклањањем катанаца и завршавањем незавршених операција. Ако икад добијете радна копија закључана грешку, извршите ову команду да уклоните украдене катанце и добијете вашу радну копију у корисном стању поново. Приметимо то да у овом контексту катанац се односи на локални фајлсистем закључавање, не на закључавање спремишта." #. (para) #: ../source/TortoiseGit_en.xml:15892 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "Субверзиона команда која се користи да пошаље измене из ваше локалне радне копије назад у спремиште, креирањем нове ревизије спремишта." #. (glossterm) @@ -13882,7 +13882,7 @@ msgstr "Конфликт" #. (para) #: ../source/TortoiseGit_en.xml:15902 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "Када се измене из спремишта стопе са локалним изменама, понекад се ове измене јављају у истим линијама. У том случају Субверзија не може аутоматски одредити коју верзију да користи и за фајл се каже да је у конфликту. Потребно је да уредите фајл ручно и разрешите конфликт пре него можете да урежете неке друге измене." #. (glossterm) @@ -13892,7 +13892,7 @@ msgstr "Копирај" #. (para) #: ../source/TortoiseGit_en.xml:15914 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "У Субверзионом спремишту можете креирати копију појединачног фајла или цело стабло. Ово се имплементира као јефтине копије које делују скоро као везе са оригиналом у томе да скоро не узимају простора. Правећи копије чува се историја ставке у копији, тако да можете пратити урађене измене пре него је копија урађена." #. (para) @@ -13917,7 +13917,7 @@ msgstr "ФСФС" #. (para) #: ../source/TortoiseGit_en.xml:15957 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "Фајлсистем у власништву Субверзије у основи спремишта. Може се користити на мрежним поделама. Подразумеван за 1.2 и новија спремишта." #. (para) @@ -13937,7 +13937,7 @@ msgstr "Последња ревизија фајла или именика у Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "Ако радна копија има измене само у текст фајловима, могуће је користити Субверзиону Дифф команду да се генерише један фајл преглед ових измена у Обједињеном Дифф формату. Фајл овог типа се често наводи као Закрпа, и може бити послат електронском поштом још некоме (или на мејлинг листу) и да се примени у другој радној копији. Неко без приступа за урезивање може направити измене и поднети фајл закрпу ауторизованом урезивачу да га примени. Или ако нисте сигурни о изменама можете поднети закрпу другима да је прегледају." #. (glossterm) @@ -13992,7 +13992,7 @@ msgstr "Својство" #. (para) #: ../source/TortoiseGit_en.xml:16050 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "Уз верзионисање ваших именика и фајлова, Субверзија допушта да се додају верзионисани метаподаци - на које се позивамо као на особине сваког од ваших верзионисаних именика и фајлова. Свака особина има име и вредност, слично као регстарски кључеви. Субверзија има неке специјалне особине које користи интерно, као што је svn:eol-style. ТортоисеСВН има неке такође, као tsvn:logminsize. Можете додати ваше личне особине са било којим именом и вредношћу коју изаберете." #. (para) @@ -14022,7 +14022,7 @@ msgstr "Када се фајлови у радној копији оставе #. (para) #: ../source/TortoiseGit_en.xml:16105 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "Субверзија чува локалну чисту копију сваког фајла као што је био када сте последњи пут ажурирали вашу радну копију. Ако направите измене и одлучите да желите да их поништите, можете користити врати команду да се вратите на чисту копију." #. (glossterm) @@ -14057,12 +14057,12 @@ msgstr "СВН" #. (para) #: ../source/TortoiseGit_en.xml:16146 -msgid "A frequently-used abbreviation for Subversion." +msgid "A frequently-used abbreviation for Git." msgstr "Често-кориишћене скраћенице у Субверзији" #. (para) #: ../source/TortoiseGit_en.xml:16149 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "Име Субверзионог обичног протокола који користи svnserve сервер спремишта." #. (para) @@ -14072,7 +14072,7 @@ msgstr "Исто како Ажурирај-до-ревизије #. (para) #: ../source/TortoiseGit_en.xml:16172 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "Субверзиона команда вуче задње промене из спремишта у радну копију, стапајући све измене направљене од других са локалним изенама у радној копији." #. (glossterm) @@ -14104,7 +14104,7 @@ msgstr "Превод" #~ msgid "username" #~ msgstr "имекорисника" #~ msgid "" -#~ "Subversion uses the / as the path delimiter in all " +#~ "Git uses the / as the path delimiter in all " #~ "internal pathnames, and all pattern matching is done against this style " #~ "of path names. If you want to use a path delimiter in your ignore " #~ "pattern, be sure to use /, and not the Windows " @@ -14116,7 +14116,7 @@ msgstr "Превод" #~ "занемаривања будите сигурни да користите /, а не " #~ "Виндоуз обратну косу црту." #~ msgid "" -#~ "Subversion uses this pattern matching against every path presented to it " +#~ "Git uses this pattern matching against every path presented to it " #~ "for action. These paths are generally relative to the directory being " #~ "acted upon for import, add, commit, etc. The matching pattern therefore " #~ "has to take account of the fact that there may or may not be path " @@ -14132,7 +14132,7 @@ msgstr "Превод" #~ "Fred.c but not subdir/Fred.c. This " #~ "is significant if you add a folder which contains some files that you " #~ "want to be ignored, because those filenames will be preceded with the " -#~ "folder name when Subversion compares them with the ignore pattern." +#~ "folder name when Git compares them with the ignore pattern." #~ msgstr "" #~ "Ако је име именика присутно у путањи алгоритам спаривања неће га скресати " #~ "тако да ће модел Fred.* спарити Fred.c\n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,7 +41,7 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" +msgid "A Git client for Windows" msgstr "Subverzioni klijent za Vindouz" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated @@ -122,7 +122,7 @@ msgstr "Auditorijum" #. (para) #: ../source/TortoiseGit_en.xml:72 -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." msgstr "Ova knjiga je napisana za poznavaoce kompjutera koji žele da koriste Subverziju da upravljaju svojim podacima, a nije im zgodno da koriste programe koji to rade iz komandne linije. Kako je TortoiseGit proÅ¡irenje vindouz Å¡koljke uzima se da je korisnik upoznat sa vindouz pretraživačem i zna kako ga koristiti." #. (title) @@ -142,17 +142,17 @@ msgstr " objaÅ¡njava Å¡ta je TortoiseGit, #. (para) #: ../source/TortoiseGit_en.xml:95 -msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." +msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." msgstr "U dali smo kratak uvod u Subverzija revizioni kontrolni sistem koji pokriva TortoiseGit. Ovo je pozajmljeno iz dokumentacije za projekat Subverzije i objaÅ¡njava rezličite pristupe kontroli verzija, i kako Subverzija radi." #. (para) #: ../source/TortoiseGit_en.xml:102 -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." msgstr "Većina Korisnika Subverzije neće nikada sami podeÅ¡avati server. Sledeće poglavlje se bavi postupkom podeÅ¡avanja servera i korisno je za administratore. " #. (para) #: ../source/TortoiseGit_en.xml:107 -msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." msgstr "Poglavlje objaÅ¡njava kako podesiti lokalno spremiÅ¡te, koje je korisno za testiranje Subverzije i TortoiseGit koristeći jedan PC. Ono takođe objaÅ¡njava neÅ¡to malo o administriranju spremiÅ¡ta Å¡to je relevantno za spremiÅ¡ta locirana na serveru." #. (para) @@ -177,7 +177,7 @@ msgstr "Deo prikazuje kako TortoiseGit GUI d #. (para) #: ../source/TortoiseGit_en.xml:134 -msgid "The give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client svn.exe." +msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." msgstr " daje korelaciju između TortoiseGit komandi i njihovih ekvivalenata u Subverzija klijenta komandne linije svn.exe." #. (title) @@ -202,7 +202,7 @@ msgstr "Zajednica" #. (para) #: ../source/TortoiseGit_en.xml:169 -msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." msgstr "I TortoiseGit i Subverzija su razvijeni od zajednice ljudi koji rade na tim projektima. Oni dolaze iz raznih zemalja iz celog sveta i udružuju se da zajedno naprave izvanredne programe." #. (title) @@ -252,12 +252,12 @@ msgstr "za pomaganje u dokumentaciji i traženju bagova" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" +msgid "The Git Book" msgstr "Knjiga Subverzija" #. (para) #: ../source/TortoiseGit_en.xml:218 -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" +msgid "for the great introduction to Git and its chapter 2 which we copied here" msgstr "za veliki uvod u Subverziju i poglavlje 2 koje smo kopirali ovde" #. (term) @@ -371,12 +371,12 @@ msgstr "Å ta je TortoiseGit?" #. (para) #: ../source/TortoiseGit_en.xml:340 -msgid "TortoiseGit is a free open-source client for the Subversion version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." +msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." msgstr "TortoiseGit je beplatan klijent otvorenog koda za Subverzioni sistem kontrole verzija. Dakle, TortoiseGit upravlja fajlovima i imenicima prekovremeno. Fajlovi su smeÅ¡teni u centralnom spremiÅ¡tu. SpremiÅ¡te je u mnogome kao pravi fajl server, osim Å¡to pamti svaku promenu ikada napravljenu na vaÅ¡im fajlovima i imenicima. Ovo vam dozvoljava da pozovete stare verzije vaÅ¡ih fajlova i proučite istoriju kako i kada su podaci promenjeni, i ko ih je promenio. Zbog toga mnogi ljudi o Subverziji i sistemima kontrole verzija uopÅ¡teno misle da su to vremenske maÅ¡ine." #. (para) #: ../source/TortoiseGit_en.xml:352 -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." msgstr "Neki sistemi kontrole verzija su takođe softver sistemi upravljanja konfiguracijom (SUK). Ovi sistemi su specijalno priagođeni da upravljaju stabla izvornog koda, i imaju mnoge osobine specifične za razvoj softvera - kao Å¡to je prirodno razumevanje programskih jezika, ili snabdevanjem alatima za izradu softvera. Subverzija, međutim, nije jedan od tih sistema; ona je opÅ¡ti sistem koji se može koristiti da upravlja svaki skup fajlova, obuhvatajući i izvorni kod." #. (title) @@ -386,17 +386,17 @@ msgstr "TortoiseGit istorija" #. (para) #: ../source/TortoiseGit_en.xml:369 -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." msgstr "U 2002 Tim Kemp je naÅ¡ao da je Subverzija bila jako dobar sistem kontrole verzija, ali je nedostajao dobar GUI klijent. Ideja za Sbverzioni klijent kao Vindouz integrisanu Å¡koljku inspirisana je sličnim klijentom za CVS imenom TortoiseCVS." #. (para) #: ../source/TortoiseGit_en.xml:375 -msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." msgstr "Tim je proučio izvorni kod TortoiseCVS i iskoristio ga kao osnovu za TortoiseGit. On je zatim započeo sa projektom, registrujući domen TortoiseGit.org i stavio je izvorni kod onlajn. U to vreme, Stefan King je tražio dobar i besplatan sistem kontrole verzija i naÅ¡ao Subverziju i izvorni kod za TortoiseGit. PoÅ¡to TortoiseGit joÅ¡ nije bio spreman za korišćenje on se pridružio projektu i počeo da programira. Uskoro je prepisao većinu postojećeg koda i počeo da dodaje komande i mogućnosti, sve do tačke gde niÅ¡ta od originalnog koda nije ostalo. " #. (para) #: ../source/TortoiseGit_en.xml:386 -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." +msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." msgstr "Å to je Subverzija postajala stabilnija privlačila je sve viÅ¡e korisnika koji su počeli da koriste TortoiseGit kao Subverzioni klijent. Korisnička osnova raste brzo (i joÅ¡ uvek raste svaki dan). To je od kad je Lube Onken ponudio da pomogne sa lepim ikonama i logom za TortoiseGit. On vodi brigu o vebsajtu i upravlja prevodima." #. (title) @@ -406,7 +406,7 @@ msgstr "TortoiseGit osobine" #. (para) #: ../source/TortoiseGit_en.xml:400 -msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features." +msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." msgstr "Å ta čini TortoiseGit tako dobrim Subverzionim klijentom? Ovde je kratka lista osobina." #. (term) @@ -446,17 +446,17 @@ msgstr "Status svakog verzionisanog fajla i imenika označen je prekrivanjem iko #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" +msgid "Easy access to Git commands" msgstr "Lak pristup Subverzionim komandama." #. (para) #: ../source/TortoiseGit_en.xml:447 -msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there." +msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." msgstr "Sve Subverzione komande su dostupne iz eksplorerovog kontekstnog menija. TortoiseGit dodaje svoj submeni onde." #. (para) #: ../source/TortoiseGit_en.xml:454 -msgid "Since TortoiseGit is a Subversion client, we would also like to show you some of the features of Subversion itself:" +msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" msgstr "Kako je TortoiseGit Subverzioni klijent, mi bismo voleli da prikažemo neke osobine same Subverzije:" #. (term) @@ -466,7 +466,7 @@ msgstr "Verzionisanje imenika" #. (para) #: ../source/TortoiseGit_en.xml:462 -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." msgstr "CVS prati samo istoriju individualnih fajlova, dok Subverzija implementiravirtualni verzionisani fajlsistem koji beleži promene celog stabla imenika prekovremeno. Fajlovi i imenici su verzionisani. Kao reziltat, postoji prava klijent-strana premesti i kopiraj komande koje rade na fajlovima i imenicima." #. (term) @@ -496,7 +496,7 @@ msgstr "Izbor mrežnih slojeva" #. (para) #: ../source/TortoiseGit_en.xml:499 -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." msgstr "Subverzija ima apstraktnu ideju pristupa spremiÅ¡tu, čineći ga lakim da ljudi inplementiraj u nove mrežne mehanizme.Subverzioni napredni mrežni serverje modul za apač veb server, koji govori varijantu HTTP zvanu VebDAV/DeltaV. To daje Subverziji veliku prednost u stabilnosti i operatibilnosti, i omogućava razne ključne osobine besplatno: autentikaciju, autorizaciju, compresiju, i pretraživanje spremiÅ¡ta, na primer.Mali, samostalni Subverzioni server proces je takođe dostupan. Ovaj server govori uopbičajeni protokol koji može biti lako provučen kroz ssh." #. (term) @@ -506,7 +506,7 @@ msgstr "Skladno rukovanje podacima" #. (para) #: ../source/TortoiseGit_en.xml:518 -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." msgstr "Subverzija izlaže fajl razlike koristeći binarni diferencijalni algoritam, koji radi identično na tekst (ljudski čitljivim) i binarnim (ljudski nečitljivim) fajlovima. Oba tipa fajlova su smeÅ¡tena jednako komprimovani u spremiÅ¡tu, i razlike su prenete u oba smera kroz mrežu." #. (term) @@ -516,7 +516,7 @@ msgstr "Efikasno grananje i označavanje" #. (para) #: ../source/TortoiseGit_en.xml:531 -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." msgstr "Cena grananja i označavanja ne treba da bude proporcionalno veličini projekta. Subverzija stvara grane i značke jednostavnim kopiranjem projekta, koristeći mehanizam sličan čvrstim linkovima. Zato ove operacije uzimaju veoma mali, konstantan iznos vremena, i veoma mali prostor u spremiÅ¡tu." #. (term) @@ -526,7 +526,7 @@ msgstr "Hakerabiliti" #. (para) #: ../source/TortoiseGit_en.xml:544 -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." +msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." msgstr "Subverzija nema istrijski prtljag; ona je implementirana kao kolekcija deljivih C biblioteka sa dobro definisanim APIjem. To čini Subverziju ekstremno podržavajućom i iskoristivom od drugih aplikacija i jezika." #. (title) @@ -671,22 +671,22 @@ msgstr "Osnovni koncept" #. (primary) #: ../source/TortoiseGit_en.xml:725 -msgid "Subversion book" +msgid "Git book" msgstr "Subverziona knjiga" #. (para) #: ../source/TortoiseGit_en.xml:727 -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." +msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." msgstr "Ovo poglavlje je malo izmenjena verzija istog poglavlja u Subverzionoj knjizi. Onlajn verzija Subverzione knjige je dostupna ovde:http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseGit_en.xml:735 -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." +msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." msgstr "Ovo poglavlje je kratak, neobavezan uvod u Subverziju. Ako ste novi u kontroli verzija, ovo poglavlje je sigurno za vas. Počinjemo diskusijom o opÅ¡tem konceptu kontrole verzija, rad nas vodi u specifične ideje unutar Subverzije, i prikazuje neke jednostavne primere Subverzije pri korišćenju." #. (para) #: ../source/TortoiseGit_en.xml:743 -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." msgstr "Uprkos tome Å¡to primeri u ovom poglavlju prikazuju ljudske deljive kolekcije izvornog koda programa, imajte na umu da Subverzija može upravljati bilo kojom vrstom kolekcije fajlova - nije ograničena na pomoć komputerskim programerima." #. (title) @@ -707,7 +707,7 @@ msgstr "spremiÅ¡te" #. (para) #: ../source/TortoiseGit_en.xml:755 -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." msgstr "Subverzija je centralizovan sistem za deljenje informcija. U srži je spremiÅ¡te, koje je centralno stovariÅ¡te podataka. SpremiÅ¡te smeÅ¡ta informacije u obliku fajlsistem stabla - tipična hijerarhija fajlova i imenika. Bilo koji broj klijenata spaja se na spremiÅ¡te i čita ili upisuje u te fajlove. Upisivanjem podataka klijent omogućava da informacija bude dostupna drugima; čitanjem podataka klijent prima informacije od drugih." #. (title) @@ -717,7 +717,7 @@ msgstr "Tipični klijent/server sistem" #. (para) #: ../source/TortoiseGit_en.xml:770 -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." msgstr "Dakle zaÅ¡to je ovo interesantno? Zato Å¡to je pesma od definicije tipičnog fajl servera. I svakako, spremiÅ¡te je vrsta fajl servera, ali nije to vaÅ¡ uobičajen soj. Å ta čini Subverziono spremiÅ¡te specijalnim je da ono pamti sve izmene ikad upisane u njega: sve izmene svakog fajla, i čak izmene samog stabla imenika, kao Å¡to je dodavanje, brisanje, i preuređenje fajlova u imenika." #. (para) @@ -791,7 +791,7 @@ msgstr "Kopiraj-Menjaj-Stopi reÅ¡enje" #. (para) #: ../source/TortoiseGit_en.xml:895 -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." msgstr "Subverzija, CVS i drugi sistemi kontrole verzija koriste kopiraj-menjaj-stopi model kao alternativu zaključavanju. U ovom modelu svaki korisnički klijent čita spremiÅ¡te i kreira ličnu radnu kopiju fajla ili projekta. Korisnici onda rade paralelno, menjajući svoje privatne kopije. Finalno, privatne kopije se spajaju u novu, finalnu verziju. Sistem kontrole verzija često posreduje u spajanju, ali ljudi su odgovorni da učine da sve bude korektno." #. (para) @@ -833,17 +833,17 @@ msgstr "Postoji jedna obična situacija gde zaključaj-menjaj-otključaj model j #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" +msgid "What does Git Do?" msgstr "Å ta Subverzija radi?" #. (para) #: ../source/TortoiseGit_en.xml:977 -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." +msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." msgstr "Subverzija koristi kopiraj-izmeni-stopi reÅ¡enje uobičajeno, i u mnogim slučajevimaovo je sve Å¡to vam je potrebno. Međutim, od Verzije 1.2 Subverzija takođe podržava zaključavanje fajlova, tako da ako imate nestopive fajlove, ili ako jednostavno forsirate politiku zaključavanja preko uprave, Subverzija će joÅ¡ omogućavati željene osobine." #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" +msgid "Git in Action" msgstr "Subverzija u akcija" #. (title) @@ -858,27 +858,27 @@ msgstr "radna kopija" #. (para) #: ../source/TortoiseGit_en.xml:995 -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." +msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." msgstr "Već ste čitali o radnoj kopiji; sada ćemo demonstrirati kako je Subverzioni klijent kreira i koristi. " #. (para) #: ../source/TortoiseGit_en.xml:1000 -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." msgstr "Subverziona radna kopija je obično stablo imenika u vaÅ¡em lokalnom sistemu, koje sadrži kolekciju fajlova. Vi možete urediti ove fajlove kako želite, i ako su fajlovi izvornog koda, možete kompajlirati vaÅ¡ program od njih na uobičajen način. VaÅ¡a radna kopija je vaÅ¡a lična privatna radna povrÅ¡ina: Subverzija neće inkorporirati izmene drugih ljudi, niti će uraditi vaÅ¡e promene dostupne drugima, sve dok joj eksplicitno ne kažete da to uradi. " #. (para) #: ../source/TortoiseGit_en.xml:1010 -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." msgstr "Kada ste napravili neke izmene u fajlovima u vaÅ¡oj radnoj kopiji i proverite da to radi ispravno, Subverzija vam omogućava komandama da publikujete vaÅ¡e izmene drugim ljudima koji rade sa vama na vaÅ¡em projektu (pisanjem u spremiÅ¡te). Ako drugi ljudi publikuju svoje izmene, Subverzija vam omogućava komandama za spajanje tih izmena u vaÅ¡ radni imenik (čitanjem iz spremiÅ¡ta)." #. (para) #: ../source/TortoiseGit_en.xml:1020 -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." msgstr "Radna kopija takođe sadrži neke ekstra fajlove, kreirane i održavane Subverzijom, dajoj pomognu da izvuče ove komande. Posebno, svaki imenik u vaÅ¡oj radnoj kopiji sadrži podimenike označene .svn, takođe poznat kao radna kopija administrativni imenik. Fajlovi u svakom administrativnom imeniku pomažu Subverziji da prepozna koji fajlovi sadrže nepublikovane izmene, i koji fajlovi su zastreli u odnosu na rad drugih." #. (para) #: ../source/TortoiseGit_en.xml:1031 -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." msgstr "Tipično Subverziono spremiÅ¡te često sadrži fajlove (ili izvorni kod) za viÅ¡e projekata; obično, svaki projekat je subimenik u stablu fajlsistema u spremiÅ¡tu. U ovom uređenju korisnička radna kopija obično će korespondirati posebnom podstablu spremiÅ¡ta." #. (para) @@ -903,12 +903,12 @@ msgstr "Da biste dobili radnu kopiju morate preuzeti neko #. (para) #: ../source/TortoiseGit_en.xml:1058 -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." msgstr "Pretpostavimo da ste napravili izmene u button.c. Kako .svn imenik pamti datum izmene fajla i originalni sadržaj, Subverzija vam može reći da ste izmenili fajl.Čin publikovanja vaÅ¡ih izmena je najčešće poznat kao urezivanje (ili prijavljivanje) izmena u spremiÅ¡te." #. (para) #: ../source/TortoiseGit_en.xml:1068 -msgid "To publish your changes to others, you can use Subversion's commit command." +msgid "To publish your changes to others, you can use Git's commit command." msgstr "Da bi publikovali vaÅ¡e izmene drugima, možete koristiti Subverzionu komandu ureži." #. (para) @@ -918,17 +918,17 @@ msgstr "Sada vaÅ¡e izmene u button.c su urezane u spremiÅ¡t #. (para) #: ../source/TortoiseGit_en.xml:1078 -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." msgstr "Pretpostavimo da imate saradnika Sali, ko proverava radnu kopiju /kalk u isto vreme kad i vi. Kada urezujete vaÅ¡e izmene u button.c, Salina radna kopija ostaje nepromenjena; Subverzija menja radnu kopiju samo na zahtev korisnika." #. (para) #: ../source/TortoiseGit_en.xml:1086 -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." msgstr "Da bi ažurirala svoj projekat Sali mora pitati Subverzilu da ažurira njenu radnu kopiju korišćrnjem Subverzione komande ažuriraj. Ovo će uključiti vaÅ¡e izmene u radnu kopiju isto kao Å¡to bilo koji drugi koji su urezani od provere." #. (para) #: ../source/TortoiseGit_en.xml:1094 -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." msgstr "Zabeležite da Sali ne treba da specifira koje fajlove ažurira; Subverzija koristi informacije u .svn imeniku, i dalje informacije u spremiÅ¡tu, da odluči koje fajlove treba ažurirati." #. (title) @@ -938,7 +938,7 @@ msgstr "URL spremiÅ¡ta" #. (para) #: ../source/TortoiseGit_en.xml:1104 -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" msgstr "Subverzionom spremiÅ¡tu može biti pristupljeno kroz mnogo različitih metoda - na lokalnom disku, ili kroz razne mrežne protokole. Mest spremiÅ¡ta, međutim, je uvek na URL. URL Å¡ema označava metod pristupa: " #. (title) @@ -975,7 +975,7 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." +msgid "Access via WebDAV protocol to Git-aware Apache server." msgstr "Pristup preko VebDAV protokola za Subverziono poznavanje ApaÅ¡ servera." #. (literal) @@ -1021,7 +1021,7 @@ msgstr "autentičan, Å¡ifriran TCP/IP pristup preko običnog protokola ka file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." msgstr "Za mnoge delove Subverzioni URLovi koriste standardnu sintaksu dozvoljavajući serverskim imenima brojevima portova da budu specificirani kao deo URLa. file:// metod pristupa se normalno koristi za lokalni pristup, takođe može se koristiti sa UNC putnjom do mrežnog domaćina. URL dakle uzima oblik file://hostname/path/to/repos. Za lokalnu maÅ¡inu hostname deo URL se zahteva da nije prisutno ili da je localhost. Iz ovog razloga lokalna putanja se normalno javlja sa tri kose crte file:///path/to/repos." #. (para) @@ -1081,7 +1081,7 @@ msgstr "Operacija svn ureži publikuje izmene bilo kog broja #. (para) #: ../source/TortoiseGit_en.xml:1231 -msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." msgstr "U spremiÅ¡tu savako urezivanje se trtira kao atomik transakcija: ili se urežu sve promene ili nijedna. Subverzija čuva ovu atomičnost u slučaju pucanja programa ili sistema, mrežnih problema i drugih akcija korisnika." #. (para) @@ -1101,7 +1101,7 @@ msgstr "Globalni revizioni brojevi" #. (para) #: ../source/TortoiseGit_en.xml:1261 -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" msgstr "Drugačije nego kod većine drugih sistema kontrole verzija, Subverzioni revizioni brojevi se pojavljuju kao cela stabla, a ne individualni fajlovi. Svaki revizioni broj selektuje celo stablo, partikularno stanje spremiÅ¡ta posle nekog urezivanja izmena. Drugi način razmiÅ¡ljanja o tome je da revizija N pretstavlja stanje fajlsistema spremiÅ¡ta posle Ntog urezivanja. Kada korisnik Subverzije govori o ``revisija 5 od foo.c'', on stvarno misli ``foo.c kako se javlja u reviziji 5.\" Primetimo da uopÅ¡te revizije N i M fajla nisu obavezno različite. " #. (para) @@ -1163,7 +1163,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1312 -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." msgstr "Saine izmene integer.c se pojavljuju u vaÅ¡oj radnoj kopiji i vaÅ¡e izmene su joÅ¡ prisutne u button.c. U ovom primeru, tekst u Makefile je identičan u revizijama 4,5 i 6, ali Subverzija će označiti vaÅ¡u radnu kopiju Makefile revizijom 6 da indicira da je joÅ¡ tekuća. Tako, posle urađenog čistog ažuriranja na vrh vaÅ¡e radne kopije ona će generalno korespondirati tačno jednoj reviziji u spremiÅ¡tu." #. (title) @@ -1173,7 +1173,7 @@ msgstr "Kako radna kopija prati spremiÅ¡te" #. (para) #: ../source/TortoiseGit_en.xml:1326 -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" +msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" msgstr "Za svaki fajl u radnom imeniku Subverzija upisuje dva važna komada informacija u .svn/ administarativnu oblast:" #. (para) @@ -1188,7 +1188,7 @@ msgstr "vremenski marker zapisan kada se lokalna kopija zadnji put ažurira u sp #. (para) #: ../source/TortoiseGit_en.xml:1345 -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" +msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" msgstr "Dajući ove informacije, govoreći spremiÅ¡tu, Subverzija može reći koje od sledećih četiri statusa ima radni fajl:" #. (term) @@ -1228,7 +1228,7 @@ msgstr "Lokalno izmenjen i zastareo" #. (para) #: ../source/TortoiseGit_en.xml:1395 -msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." msgstr "Fajl je izmenjen u oba slučaja i u radnom imeniku i u spremiÅ¡tu. Urezivanje fajla biće neuspeÅ¡no sa greÅ¡kom zastareo. Fajl se mora najpre ažurirai; sa ažuriraj komandom pokuÅ¡aće se spajanje javnih izmena sa lokalnim izmenama. Ako Subverzija ne može potpuno da stopi na razuman način automatski, ona ostavlja korisniku da razreÅ¡i konflikt. " #. (title) @@ -1238,7 +1238,7 @@ msgstr "Zaključak" #. (para) #: ../source/TortoiseGit_en.xml:1413 -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" +msgid "We've covered a number of fundamental Git concepts in this chapter:" msgstr "Mi smo ovde pokrili određeni broj osnovnih Subverzionih koncepata:" #. (para) @@ -1248,12 +1248,12 @@ msgstr "Uveli smo označavanje centralnog spremiÅ¡ta, klijentove radne kopije, i #. (para) #: ../source/TortoiseGit_en.xml:1425 -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." msgstr "Vidli smo neke proste primere kako saradnici mogu da koriste Subverziju da publikuju i prime izmene od drugih, koristeći 'kopiraj-menjaj-stopi' model." #. (para) #: ../source/TortoiseGit_en.xml:1432 -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." +msgid "We've talked a bit about the way Git tracks and manages information in a working copy." msgstr "Govorili smo o načinu kako Subverzija prati i upravlja informacijama u radnoj kopiji." #. (title) @@ -1263,12 +1263,12 @@ msgstr "PodeÅ¡avanje servera" #. (para) #: ../source/TortoiseGit_en.xml:1447 -msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." msgstr "Da koristite TortoiseGit (ili bilo koji drugi Subverzioni klijent), potrebno vam je mesto gde je locirano vaÅ¡e spremiÅ¡te. Možete uskladiÅ¡titi vaÅ¡e spremiÅ¡te lokalno i pristupati mu koristeći file:// protokol ili ga smestiti na serveu i pristupati mu sa http:// ili svn:// protokolima. Dva server protokola mogu, takođe, biti Å¡ifrovana. Koristite https:// ili svn+ssh://. Ovo poglavlje prikazuje korak po korak kako podeÅ¡avate takav server na Vindouz maÅ¡ini. " #. (para) #: ../source/TortoiseGit_en.xml:1458 -msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." +msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." msgstr "Detaljnije informacije o opcijama Subverzionog servera i kako izabrati najbolju arhitekturu za vaÅ¡u situaciju, može se naći u knjizi Subverzije pod Server konfiguracija." #. (para) @@ -1293,7 +1293,7 @@ msgstr "ApaÅ¡" #. (para) #: ../source/TortoiseGit_en.xml:1486 -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" msgstr "Najfleksibilniji od svih mogućih server podeÅ¡avanja za Subverziju je ApaÅ¡ zasnovani server. Mada je malo komplikovaniji za podeÅ¡avanje on pruža pogodnosti koje drugi serveri nemaju:" #. (primary) @@ -1305,7 +1305,7 @@ msgstr "VebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." +msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." msgstr "ApaÅ¡ zasnovan Subverzioni server koristi VebDAV protokol koji je dobro podržan sa mnogo drugih programa. Mogli biste npr. postaviti spremiÅ¡te kao Veb imenik/quote> u Vindouz eksploreru i da mu pristupate kao svakom drugom imeniku fajl sistema." #. (term) @@ -1315,7 +1315,7 @@ msgstr "Pretraživanje spremiÅ¡ta" #. (para) #: ../source/TortoiseGit_en.xml:1511 -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." msgstr "Možete dovesti vaÅ¡ pretraživač na URL spremiÅ¡ta i pretraživati njegov sadržaj bez instaliranog Subverzionog klijenta. Ovo daje pristup vaÅ¡im podacima mnogo Å¡irem krugu korisnika." #. (term) @@ -1397,17 +1397,17 @@ msgstr "Prva svar koja vam je potrebna pre instaliranja ApaÅ¡a je kompjuter sa V #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" +msgid "Installing Git" msgstr "Instaliranje Subverzije" #. (para) #: ../source/TortoiseGit_en.xml:1632 -msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." -msgstr "Skinite zadnju verziju Subverzije Vin32 binarije za ApaÅ¡. Budite sigurni da ste dobili ispravnu verziju za integraciju sa vaÅ¡om verzijom ApaÅ¡a, u suprotnom će te dobiti čudne poruke greÅ¡ke kada probate sa restartom. Ako imate ApaÅ¡ 2.2.x idite na http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." +msgstr "Skinite zadnju verziju Subverzije Vin32 binarije za ApaÅ¡. Budite sigurni da ste dobili ispravnu verziju za integraciju sa vaÅ¡om verzijom ApaÅ¡a, u suprotnom će te dobiti čudne poruke greÅ¡ke kada probate sa restartom. Ako imate ApaÅ¡ 2.2.x idite na http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseGit_en.xml:1644 -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." msgstr "Pokrenite Subverzionu instalaciju i pratite instrukcije. Ako instalacija Subverzije prepozna da ste instalirali ApaÅ¡ onda je u redu. Ako ne nađe ApaÅ¡ server morate uraditi neke dodatne korake." #. (primary) @@ -1419,12 +1419,12 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "Koristeći vindouz pretraživač idite na instalacioni imenik Subverzije (obično c:\\program files\\Subversion) i nađite fajlove /httpd/mod_dav_svn.so i mod_authz_svn.so. Kopirajte ove fajlove u ApaÅ¡ imenik modula (obično c:\\program files\\apache group\\apache2\\modules )." +msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "Koristeći vindouz pretraživač idite na instalacioni imenik Subverzije (obično c:\\program files\\Git) i nađite fajlove /httpd/mod_dav_svn.so i mod_authz_svn.so. Kopirajte ove fajlove u ApaÅ¡ imenik modula (obično c:\\program files\\apache group\\apache2\\modules )." #. (para) #: ../source/TortoiseGit_en.xml:1669 -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." msgstr "Kopirajte fajl /bin/libdb*.dll i /bin/intl3_svn.dll iz Subverzijinog instalacionog imenika u ApaÅ¡ bin imenik." #. (para) @@ -1468,12 +1468,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +" This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "Na kraj konfig fajla dodajte sledeće linije:\n" "<Location /svn>\n" @@ -1482,7 +1482,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -1511,12 +1511,12 @@ msgstr "Restrtujte ApaÅ¡ server ponovo." #. (para) #: ../source/TortoiseGit_en.xml:1764 -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." msgstr "Upravite vaÅ¡ pretraživač na http://MyServer/svn/MyNewRepository (gde je MyNewRepository ime Subverzionog spremiÅ¡ta koje ste ranije kreirali). Ako je sve dobro proÅ¡lo bićete upitani za korisničko ime i lozinku, zatim možete videti sadržaj spremiÅ¡ta." #. (para) #: ../source/TortoiseGit_en.xml:1703 -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " msgstr "Sada možete podesiti ApaÅ¡ i Subverziju, ali ApaÅ¡ joÅ¡ ne zna kako da opsluži Subverzionog klijenta kao Å¡to je TortoiseGit. Da bi ApaÅ¡ znao koji URL treba koristiti za Subverziono spremiÅ¡te morate da uredite ApaÅ¡ konfiguracioni fajl )obično na lokaciji c:\\program files\\apache group\\apache2\\conf\\httpd.conf) bilo kojim uređivačem teksta koji volite (npr. Notepad): " #. (primary) @@ -1555,17 +1555,17 @@ msgstr "http://MyServer/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 -msgid "means that the Subversion repositories are available from the URL " +msgid "means that the Git repositories are available from the URL " msgstr "znači da je Subverziono spremiÅ¡te dostupno sa URL " #. (entry) #: ../source/TortoiseGit_en.xml:1805 -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." +msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." msgstr "kaže ApaÅ¡u koji modul je odgovoran da opsluži taj URL - u ovom slučaju Subverzioni modul." #. (entry) #: ../source/TortoiseGit_en.xml:1812 -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." +msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." msgstr "Za Subverziju 1.3 i viÅ¡e, ova direktiva omgućava listanje svih raspoloživih spremiÅ¡ta pod ." #. (filename) @@ -1575,7 +1575,7 @@ msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " +msgid "tells Git to look for repositories below " msgstr "kaže Subverziji da pogleda spremiÅ¡te ispod " #. (entry) @@ -1600,7 +1600,7 @@ msgstr "određuje koji fajl lozinki koristiti za autentifikaciju" #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" +msgid "Location of the Access file for paths inside a Git repository" msgstr "Lokacija fajla računa za putanje unutar Subverzionog spremiÅ¡ta" #. (entry) @@ -1632,7 +1632,7 @@ msgstr "" msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " +" and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "Korišćenje passwd fajla ograničava i garantuje pristup svim vaÅ¡im spremiÅ¡tima kao jedinicama. Ako želite viÅ¡e kontrole na to koji korisnici imaju pristup svakom imeniku unutar spremiÅ¡ta možete otkomentirati liniju \n" "#AuthzSVNAccessFile svnaccessfile\n" @@ -1676,12 +1676,12 @@ msgstr "Indeks projekta" #. (para) #: ../source/TortoiseGit_en.xml:1955 -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." msgstr "Ako ste koristili SVNPredakPutanja direktivu zatim vi niste menjali ApaÅ¡ kofig fajl svaki put kada ste dodavali novo Subverziono spremiÅ¡te. Jednostavno kreirajte novo spremiÅ¡te pod istom lkacijom kao prvo spremiÅ¡te i vi ste zavrÅ¡ili! U mojoj kompaniji ja imam direktan pristup specifičnom imeniku na serveru preko SMB (normalan vindouz pristup fajlovima). Tako sam samo kreirao novi imenik tamo, pokrenuo TortoiseGit komandu TortoiseGitCreate repository here... i novi projekat je dobio dom..." #. (para) #: ../source/TortoiseGit_en.xml:1969 -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." msgstr "Ako koristite Subverziju 1.3 ili kasniju, morate koristiti SVNListajPredakPutanju na direktivu da omogućite ApaÅ¡u da da listing svih dostupnih projekata ako upravite vaÅ¡ pretraživač na predačku putanju pre nego na posebno spremiÅ¡te. " #. (title) @@ -1696,7 +1696,7 @@ msgstr "Autorizacija" #. (para) #: ../source/TortoiseGit_en.xml:1984 -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." msgstr "Modul mod_authz_svn omogućava fino-zrnastu kontrolu na dozvolama zasnovanog pristupa korisničkih imena i putanja spremiÅ¡ta. Ovo je omogućeno ApaÅ¡ serverom i od Subverzije 1.3 moguće je sa svnserv." #. (para) @@ -1835,7 +1835,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" +"To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" @@ -1880,7 +1880,7 @@ msgstr "Da omogućite SSL na vaÅ¡em serveru, vidite poglavlje: AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." +msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." msgstr "Subverzioni AuthzSVNAccessFile fajlovi su osetljivi na veličinu slova u imenima korisnika (JUser je različito odjuser)." #. (para) @@ -1890,7 +1890,7 @@ msgstr "U Mikrosoftovom svetu, Vindouz domeni i korisnička imena nisu osetljivi #. (para) #: ../source/TortoiseGit_en.xml:2150 -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." msgstr "Ova razlika vas može ugristi kada koristite SSPI autentifikaciju kao vindouz domen i korisničko ime prođe u Subverziju u istom obliku kako ga je korisnik otkucao u promptu. Internet Eksplorer često propuÅ¡ta korisničko ime ka ApaÅ¡u automatski koristeći bilo koju veičinu slova bez obzira kako je račun ispisan." #. (para) @@ -1900,7 +1900,7 @@ msgstr "Krajnji rezultat je da vam možda treba najmanje dva ulaza u vaÅ¡ AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." msgstr "ApaÅ¡ev dnevnik greÅ¡aka i pristupa je vaÅ¡ najbolji prijatelj pri deÅ¡ifrovanju problema kao Å¡to su oni koji vam pomažu da otkrijete string korisničkog imena u svnaccessfile (npr. DOMAIN\\user prema DOMAIN//user) da bi dobili da sve radi." #. (title) @@ -1915,7 +1915,7 @@ msgstr "ViÅ¡estruke autentifikacije" #. (para) #: ../source/TortoiseGit_en.xml:2184 -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." msgstr "Moguće je imati viÅ¡e od jednog autentifikacionog izvora za Subverziono spremiÅ¡te. Da se to uradi potrebno je napraviti svaki autentifikacioni tip neautoritativan tako da ApaÅ¡ proverava viÅ¡estruke izvore da bi dohvatio korisnik/lozinka." #. (para) @@ -1945,7 +1945,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -1970,7 +1970,7 @@ msgstr "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -2097,12 +2097,12 @@ msgstr "SSL i Internet Eksplorer" #. (para) #: ../source/TortoiseGit_en.xml:2339 -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Subversion client are still able to authenticate." +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." msgstr "Ako osigurate vaÅ¡ server sa SSL i koristite autentifikaciju prema Vindouz domenu vi ćete naći da pretraživanje spremiÅ¡ta Internet Eksplorerom uopÅ¡te ne radi. Ne brinite - to samo Internet Eksplorer nije sposoban da autentifikuje. Drugi pretraživači nemaju taj problem i TortoiseGit i bilo koji drugi Subverzioni klijent joÅ¡ može da autentifikuje." #. (para) #: ../source/TortoiseGit_en.xml:2353 -msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." +msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." msgstr "definiÅ¡ite odvojenu <Location /path> direktivu u ApaÅ¡ konfig fajlu, i dodajte SSPIBasicPreferred On. Ovo će omogućiti IE da autentifikuje opet, ali drugi pretraživači i Subverzija nisu sposobni da autentifikuju prema lokaciji." #. (para) @@ -2137,7 +2137,7 @@ msgstr "Forsiranje SSL pristupa" #. (para) #: ../source/TortoiseGit_en.xml:2395 -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." msgstr "Kada se podesi SSP da učini spremiÅ¡te sigurnim, možete želeti da onemogućiti normalni pristup preko non-SSL (http) i dozvoljava samo https pristup. Da se to uradi, treba dodati joÅ¡ jednu direktivu u Subverziju <Location> block: SSLRequireSSL." #. (para) @@ -2149,7 +2149,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2162,7 +2162,7 @@ msgstr "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -2181,7 +2181,7 @@ msgstr "Poslato TortoiseGit poÅ¡tanskoj listi od Nigel Grina. Hvala!" #. (para) #: ../source/TortoiseGit_en.xml:2424 -msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Subversion server." +msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." msgstr "U nekim serverskim konfiguracijama treba da podesite pojednačni server koji sadrži 2 virtualna SSL domaćina: Prvi za publik veb pristup, bez zahteva za klijentske sertifikate. Drugi da bude siguran sa traženjem sertifikata klijenta, izvrÅ¡avajući Subverzioni server." #. (para) @@ -2192,7 +2192,7 @@ msgstr "Dodavanje SSLPriveraKlijenta Opciono direktivu u \n" +"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" @@ -2214,10 +2214,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2239,10 +2239,10 @@ msgstr "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -2260,7 +2260,7 @@ msgstr "Svnserv zasnovan server" #. (para) #: ../source/TortoiseGit_en.xml:2485 -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." msgstr "Mogu se javiti situacije gde nije mogućw da se koristi ApaÅ¡ kao server. Srećom, Subverzija uključuje Svnserv - jednostavan samostalan server koji koristi običan protokol preko redovne TCP/IP veze." #. (para) @@ -2275,23 +2275,23 @@ msgstr "Istaliranje svnserva" #. (para) #: ../source/TortoiseGit_en.xml:2502 -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." -msgstr "Uzmite zadnju verziju Subverije sa http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternativno uzmite upakovanu instalaciju od KolabNeta sa http://www.collab.net/downloads/subversion. Ova instalacija će podesiti svnserv kao Vindouz servis, takđe uključuje neke alate koji su vam potrebni ako nameravate da koristite SASL za sigurnost." +msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." +msgstr "Uzmite zadnju verziju Subverije sa http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternativno uzmite upakovanu instalaciju od KolabNeta sa http://www.collab.net/downloads/Git. Ova instalacija će podesiti svnserv kao Vindouz servis, takđe uključuje neke alate koji su vam potrebni ako nameravate da koristite SASL za sigurnost." #. (para) #: ../source/TortoiseGit_en.xml:2516 -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." +msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." msgstr "Ako već imate verziju Subverzije i pokrenut je svnserv, trebaće da ga zaustavite pre nego nastavite." #. (para) #: ../source/TortoiseGit_en.xml:2522 -msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." +msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." msgstr "Pokrenite Subverzionu instalaciju. Ako radite instalaciju na vaÅ¡em serveru (preporučljivo) preskočite korak 4." #. (para) #: ../source/TortoiseGit_en.xml:2528 -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "Otvorite vindouz-eksplorer, idite na instalacioni direktorijum Subverzije (obično C:\\Program Files\\Subversion) i na < filename>bin imenik, nađite fajlove svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - kopirajte ove falove, ili samo kopirajte sve iz bin imenika, u imenik na vaÅ¡em serveru npr. c:\\svnserve" +msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "Otvorite vindouz-eksplorer, idite na instalacioni direktorijum Subverzije (obično C:\\Program Files\\Git) i na < filename>bin imenik, nađite fajlove svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - kopirajte ove falove, ili samo kopirajte sve iz bin imenika, u imenik na vaÅ¡em serveru npr. c:\\svnserve" #. (title) #: ../source/TortoiseGit_en.xml:2550 @@ -2361,7 +2361,7 @@ msgstr "Pokretanje svnserva kao Servis" #. (para) #: ../source/TortoiseGit_en.xml:2624 -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." msgstr "Pokretanje svnserva kao korisnik nije najbolji način. To znači da ima korisnik koji je uvek upisan na vaÅ¡em serveru i pamti se da se restartuje posle ponovnog pokretanja. Bolji način je da pokrenete svnserv kao vindouz servis. PočevÅ¡i od Subverzije 1.4, svnserv se može instalirati kao prirodni vindouz servis." #. (para) @@ -2369,28 +2369,28 @@ msgstr "Pokretanje svnserva kao korisnik nije najbolji način. To znači da ima msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Da bi se instalirao svnserv kao prirodni vindouz servis izvrÅ¡ite sledeću komandu, celu na jednoj liniji, da kreirate servis koji automatski kreće kad vindouz krene. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" #. (para) @@ -2403,7 +2403,7 @@ msgstr "Primetimo nepoželjan format komandne linije koji koristi scThe Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." +" Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Mikrosoft sada preporučuje servise da rade pod ili LokalServis ili MrežniServis nalog. Uporedite sa Servisi i Servis nalog sigurnost vodič planiranja . Da bi se kreirao servis pod Lokal Servis nalogom, dodajte sledeće gornjem primeru. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" @@ -2485,7 +2485,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2755 -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" msgstr "Ako održavate viÅ¡e spremiÅ¡ta koristeći istu bazu lozinki, korišćenje autentifikacione oblasti olakšće život korisnicima, kako TortoiseGit keÅ¡ira vaÅ¡u akreditaciju vi ćete je uraditi samo jedanput. ViÅ¡e informacija se može naći u Subverzionoj knjizi, specijalno u delu Kreirajte 'users' fajl i oblast i Klient Kredencials KeÅ¡ing" #. (title) @@ -2505,12 +2505,12 @@ msgstr "Å ta je SASL?" #. (para) #: ../source/TortoiseGit_en.xml:2779 -msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." +msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." msgstr "Cirus jednostavna autentifikacija i sigurnosni sloj je softver otvorenog koda napisan na Karnegi Melon univerzitetu. On dodaje srodnu autentifikaciju i mogućnosti Å¡ifriranja svakom mrežnom protokolu i od Subverzije 1.5 i dalje, oba, svnserv i TortoiseGit klijenti znaju kako da koriste ovu biblioteku. " #. (para) #: ../source/TortoiseGit_en.xml:2787 -msgid "For a more complete discussion of the options available, you should look at the Subversion book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." +msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." msgstr "Za kompletniju diskusiju dostupnih opcija treba pogledati Subverzionu knjigu u delu Koristeći svnserv sa SASL . Ako ste samo potražili lak način da podesite sigurnu autentifikaciju i Å¡ifriranje na Vindouz serveru vaÅ¡em spremiÅ¡tu će se pristupati preko velikog loÅ¡eg Internet čitanja." #. (title) @@ -2531,12 +2531,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2810 -msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." +msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." msgstr "Drugo, kreirajte fajl koji se zove svn.conf na konvencionalnu lokaciju - tipično u imeniku gde je subverzija instalirana." #. (para) #: ../source/TortoiseGit_en.xml:2815 -msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Subversion install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." +msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." msgstr "Treće, kreirajte dva nova registar ulaza da kažete SASL gde da nađe potrebne stvarčice. Kreirajte registar ključ pod imenom [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] i stavite dva nova stringa unutar njega: SearchPath podesite na putanju imenika koji sadrži sasl*.dll plagin (normalno u Subverzioni instalacioni imenik), i ConfFile podeÅ¡en na imenik koji sadži svn.conf fajl. Ako koristite KolabNet instalator, ovi registar ključevi će biti već kreirani za vas." #. (para) @@ -2626,8 +2626,8 @@ msgstr "Osnovni metod podeÅ¡avanja vaÅ¡eg servera dat je u Version Control with Subversion." -msgstr "Dalje informacije o svnservu mogu se naći na Version Control with Subversion." +msgid "Further information about svnserve can be found in the Version Control with Git." +msgstr "Dalje informacije o svnservu mogu se naći na Version Control with Git." #. (title) #: ../source/TortoiseGit_en.xml:2923 @@ -2637,7 +2637,7 @@ msgstr "Putanjom-zasnovana autorizacija sa svnservom." #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." @@ -2649,12 +2649,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2946 -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseGit." +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." msgstr "Nije bitno koji protokol koristite da pristupite spremiÅ¡tu, uvek vam je potrebno da kreirate bar jedno spremiÅ¡te. Ovo može biti urađeno Subverzionom komandnom linijom ili klijentom sa TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:2951 -msgid "If you haven't created a Subversion repository yet, it's time to do that now." +msgid "If you haven't created a Git repository yet, it's time to do that now." msgstr "Ako joÅ¡ niste kreirali Subverziono spremiÅ¡te, vreme je da to uradite sada." #. (title) @@ -2669,7 +2669,7 @@ msgstr "kreiraj spremiÅ¡te" #. (para) #: ../source/TortoiseGit_en.xml:2963 -msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Subversion book for more information." +msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." msgstr "Možete kreirati spremiÅ¡te sa FSFS kraj ili stari Berkli baza podataka (BDB) format. FSFS format je generalno brži i lakÅ¡i za administraciju, radi na mrežnom deljenom prostoru i Vindouz 98 bez problema. BDB format je zamiÅ¡ljen mnogo stabilnijim jednostavno zato Å¡to se duže koristi, ali od kako je FSFS u upotrebi nekoliko godina taj argument je sve slabiji. Pročitajte Izbor smeÅ¡tanja podataka u Subverzionoj knjizi za viÅ¡e informacija." #. (title) @@ -2781,7 +2781,7 @@ msgstr "UNC putanja" #. (para) #: ../source/TortoiseGit_en.xml:3094 -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." msgstr "Da se pristupi lokalnom spremiÅ¡tu potrbna je putanja do tog imenika. Setimo se da Subverzija očekuje sve putanje spremiÅ¡ta u obliku file:///C:/SVNRepository/. Zapazimo korišćenje pravih kosih crta u celoj putanji." #. (para) @@ -2821,7 +2821,7 @@ msgstr "Najpre dajete svakom korisniku direktno pravo upisa u spremiÅ¡te, tako d #. (para) #: ../source/TortoiseGit_en.xml:3141 -msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." +msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." msgstr "Drugo, neće svi protokoli za mrežni deljeni prostor podržavatizaključavanje koje zahteva Subverzija, tako da možete naći vaÅ¡e spremiÅ¡te pokvareno. To se ne mora desiti odmah, ali jednog dana dva korisnika mogu pokuÅ¡ati da pristupe spremiÅ¡tu u isto vreme. " #. (para) @@ -2925,7 +2925,7 @@ msgstr "Ako usvojimo vrÅ¡ni nivo /trunk /tags /branches pri #. (para) #: ../source/TortoiseGit_en.xml:3220 -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." msgstr "Za projekte koji nisu povezani možete viÅ¡e voleti da koristite odvojena spremiÅ¡ta. Kada urezujete izmene, revizioni broj celog spremiÅ¡ta se menja, ne revizioni broj projekta. Ako imate 2 nezavisna projekta deljenje spremiÅ¡ta može značiti velike praznine u revizionim brojevima. Subverzija i TortoiseGit projekti se pojavljuju na istim adresama domaćina, ali su sasvim nezavisna spremiÅ¡ta omogućavajući nezavisan razvoj i nema kofuzije oko razvojnih brojeva." #. (para) @@ -3014,8 +3014,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3332 -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "Alat svnadmin je instaliran automatski kada instalirate Subverzionog klijenta komandne linije. Ako instalirate alat komandne linije na Vindouz PC, najbolji način je da skinete Vindouz instoler verziju. Ona je efikasnije komprimovana nego .zip verzija, tako da je skidanje manje, i ono vodi brigu da podesi putanju za vas. Možete skibuti zadnju verziju Subverzionog klijenta komandne linije sa http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "Alat svnadmin je instaliran automatski kada instalirate Subverzionog klijenta komandne linije. Ako instalirate alat komandne linije na Vindouz PC, najbolji način je da skinete Vindouz instoler verziju. Ona je efikasnije komprimovana nego .zip verzija, tako da je skidanje manje, i ono vodi brigu da podesi putanju za vas. Možete skibuti zadnju verziju Subverzionog klijenta komandne linije sa http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:3347 @@ -3041,7 +3041,7 @@ msgstr "zakačive skripte sa serverske strane" #. (para) #: ../source/TortoiseGit_en.xml:3357 -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." msgstr "Zakačive skripte su programi okidane nekim događajem iz spremiÅ¡ta, kao Å¡to je kreiranje nove revizije ili izmena neverzionirane osobine. Svaka zakačaljka je rukovođena sa dovoljno informacija da kže koji događaj se desio, koji okidač(i) je pokrenuo i korisničko ime osobe koja je okinula događaj. U zavisnosti od izlaza zakačaljke ili povratnog statusa, zakačiv program može nastaviti akciju, zaistaviti je, ili suspendovati na neki način. Molim vas da pogledate poglavlje Zakačive skripte u Subverzionoj knjizi za pune detalje o zakačaljkama koje su implementirane." #. (para) @@ -3093,7 +3093,7 @@ msgstr "vebsajt" #. (para) #: ../source/TortoiseGit_en.xml:3411 -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." +msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." msgstr "Ako želite učiniti vaÅ¡e Subverziono spremiÅ¡te dostupno drugima morate uključiti vezu ka njemu od vaÅ¡eg vebsajta. Jedan način da se to uradi mnogo pristupčnije je da se uključi veza preuzimanja za druge TortoiseGit korisnike." #. (para) @@ -3159,17 +3159,17 @@ msgstr "Vodič dnevnog korišćenja" #. (para) #: ../source/TortoiseGit_en.xml:3457 -msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." msgstr "Ovaj dokument opisuje korišćenje dan za danom klijenta TortoiseGit. To nije uvod u sistem kontrole verzija, i nije uvod u Subverziju (SV). To je viÅ¡e kao mesto gde se možete vratiti tamo gde približno znate Å¡ta želite da uradite, ali ne razumete kako da to uradite." #. (para) #: ../source/TortoiseGit_en.xml:3465 -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." +msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." msgstr "Ako želite uvod u kontrolu verzija sa Subverzijom, preporučujemo vam da pročitate fantastičnu knjigu: Kontrola verzija sa Subverzijom." #. (para) #: ../source/TortoiseGit_en.xml:3472 -msgid "This document is also a work in progress, just as TortoiseGit and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." +msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." msgstr "Ovaj dokument je takođe u radu, kao i TortoiseGit to je i Subverzija. Ako nađete neku greÅ¡ku, molim vas poÅ¡aljite je na poÅ¡tansku listu da možemo ažurirati dokumentaciju. Neke slike ekrana u Vodiču dnevnog korišćenja (VDK) možda ne odražavaju tekuće stanje softvera. Molim vas da nam oprostite. Mi radimo na TortoiseGit u svoje slobodno vreme." #. (para) @@ -3184,12 +3184,12 @@ msgstr "Trebalo bi da ste familijarni sa sistemom kontrole verzija." #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." +msgid "You should know the basics of Git." msgstr "Trebalo bi da znate osnove Subverzije." #. (para) #: ../source/TortoiseGit_en.xml:3499 -msgid "You should have set up a server and/or have access to a Subversion repository." +msgid "You should have set up a server and/or have access to a Git repository." msgstr "Trebalo bi da imate podeÅ¡en server i-ili da imate pristup Subverzionom spremiÅ¡tu." #. (para) @@ -3379,12 +3379,12 @@ msgstr "svn.username sadrži akreditaciju autentifikacje sa #. (para) #: ../source/TortoiseGit_en.xml:3650 -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " -msgstr "Ako je spremiÅ¡te kome pokuÅ¡avate da pristupite zaÅ¡tićeno lozinkom, autentifikacioni dijalog će vam biti prikazan. Unesite korisničko ime i lozinku. Boks prove će učiniti da TortoiseGit smesti akreditaciju u Subverzionom uobičajenom imeniku: %APPDATA%\\Subversion\\auth u stablu subimenika: " +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " +msgstr "Ako je spremiÅ¡te kome pokuÅ¡avate da pristupite zaÅ¡tićeno lozinkom, autentifikacioni dijalog će vam biti prikazan. Unesite korisničko ime i lozinku. Boks prove će učiniti da TortoiseGit smesti akreditaciju u Subverzionom uobičajenom imeniku: %APPDATA%\\Git\\auth u stablu subimenika: " #. (para) #: ../source/TortoiseGit_en.xml:3681 -msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." +msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." msgstr "Ako želite da obriÅ¡ete autentifikacioni keÅ¡ za sve servere, možete to uraditi od Zapamćeni podaci strane TortoiseGit dijaloga podeÅ¡avanja.To dugme će očistiti sve autentifikacione keÅ¡irane podatke iz Subverzionog auth imenika, kao i bilo koji autentifikacioni podatak smeÅ¡ten u registru od ranijih verzija TortoiseGit. Uporedite sa ." #. (para) @@ -3460,7 +3460,7 @@ msgstr "Lako je uvesti u loÅ¡ nivo imenika u spremiÅ¡tu." #. (para) #: ../source/TortoiseGit_en.xml:3736 -msgid "This section describes the Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." +msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "Ovaj deo opisuje Subverzionu komandu uvoza, koja je dizajnirana za uvoz hijerarhiju imenika u spremiÅ¡te u jednom opaljenju. Bez obzira Å¡to to zavrÅ¡ava posao to ima viÅ¡e greÅ¡aka: Iz ovih razloga preporučujemo da ne koristite komandu uvoza uopÅ¡te već radije pratite dvostepen metod opisan u . Ali poÅ¡to ste ovda, evo kako osnovni uvoz radi ..." #. (para) @@ -3580,7 +3580,7 @@ msgstr "Kao primer možete pogledati TortoiseGit skript za izgradnju. On poziva #. (para) #: ../source/TortoiseGit_en.xml:3916 -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." msgstr "Da ne bi uznemiravali korisnike takođe dodamo fajl TortoiseVars.bat listi zanemarenih predačkog imenika, tj. mi smo podesili Subverzionu osobinu svn:zanemari da uključi to ime fajla. Na taj način on se neće pokazati neverzionisanim kod svakog urezivanja." #. (title) @@ -3608,11 +3608,11 @@ msgstr "Ponekad je korisno da se konsultuje radna kopija koja je napravljena od #. (para) #: ../source/TortoiseGit_en.xml:3940 msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." +" Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" "Recimo da ste preuzeli radnu kopiju od /project1 do D:\\dev\\project1. Izaberite imenik D:\\dev\\project1, desni klik i izaberite Vindouz MeniOsobine iz kontekst menija. Osobine dijalog dolazi. Zatim idite na tab Subverzija. Tamo možete podesiti osobine. Kliknite Dodaj.... Izaberite svn:spoljaÅ¡nje osobine u komboboksu i napiÅ¡ite URL spremiÅ¡ta u formatu ime url ili ako želite da specificirate partikularnu reviziju, ime -rREV url Mžete dodati viÅ¡estruke spoljaÅ¡nje projekte, 1 po liniji. Primetimo da taj URL mora biti odgovarajuće popunjen kosim crtama ili to neće raditi. Na primer morate zameniti svaki razmak sa %20. Primetimo da nije moguće koristiti imena imenika sa razmacima u njima. Pretpostavimo da imate podeÅ¡ene ove osobine na D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" @@ -3646,7 +3646,7 @@ msgstr "Ako koristite apsolutne URLove u svn:spoljaÅ¡nje defi #. (para) #: ../source/TortoiseGit_en.xml:4016 -msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." +msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." msgstr "Da se izbegnu takvi problemi Subverzioni klijenti od verzije 1.5 podržavaju relativne spoljaÅ¡nje URLove. Četiri različita metoda specificiranja relativnih URLova je podržano. U sledećem primerima uzmimo da imamo dva spremiÅ¡ta: jedno na systemitem class=\"url\">http://example.com/svn/repos-1 i drugo na http://example.com/svn/repos-2. Preuzeli smo http://example.com/svn/repos-1/project/trunku C:\\Working i svn:spoljaÅ¡nje osobine su podeÅ¡ene na deblo." #. (term) @@ -3875,7 +3875,7 @@ msgstr "Ponovite isti proces za Project25." #. (para) #: ../source/TortoiseGit_en.xml:4298 -msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Subversion has created the intermediate folders for you without populating them." +msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." msgstr "Upravite se ka Project76/SubProj i uradite isto. Ovog puta primetimo da Project76 imenik nema sadržaj osim za SubProj, koji je sam potpuno poppunjen. Subverzija je kreirala prelazne imenike za vas ne popunjavajući ih." #. (title) @@ -3885,7 +3885,7 @@ msgstr "Dubina radne kopije ne može da se umanji" #. (para) #: ../source/TortoiseGit_en.xml:4309 -msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Subversion." +msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." msgstr "Kada jednom preuzmete radnu kopiju do određene dubine možete povećati dubinu kasnije da dođete do viÅ¡e sadržaja. međutim ne možete redukovati dubinu da izbacite sadržaj. Ova osobina će biti dodata u kasnijim verzijama Subverzije." #. (title) @@ -4027,7 +4027,7 @@ msgstr "Kolone prikazane u donjem panelu su prilagodljive. Ako uradite d #. (para) #: ../source/TortoiseGit_en.xml:4495 -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion configuration file." +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." msgstr "Uobičajeno je da kada se urezuju izmene, svako zaključavanje koje držite na fajlovima se automatski otključava posle zadovoljavajućeg urezivanja. Ako želite da zadržite zaključavanje budite sigurni da je Čuvaj zaključavanje čekboks je čekiran. Uobičajeno stanje ovog čekboksa uzet je iz no_unlock opcije u Subverzionom konfiguracionom fajlu. Pročitajte za informacije kako urediti Subverzioni konfiguracioni fajl." #. (para) @@ -4051,7 +4051,7 @@ msgstr "Popravka spoljaÅ¡njih preimenovanja" #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5337 -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "Ponekad se fajlovi preimenuju van Subverzije, i oni su prikazani u listi fajlova kao fajl koji nedostaje ili neverzionisani fajl. Da bi izbegli gubljenje istorije potrebno je notirati Subverziji o vezi. Jednostavno izaberite obe stavri, staro ime (nedostajuće) i novo ime (neverzionisano) koristi Kontekst MeniPopravi Pomeranje da se upare dva fajla kao preimenovanje." #. (title) @@ -4063,7 +4063,7 @@ msgstr "Liste izmena" #. (para) #: ../source/TortoiseGit_en.xml:4539 -msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." +msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "Dijalog urezivanja podržava Subverzijinu listu izmena osobine da pomogne grupisanjem odgovarjućih fajlova zajedno. Nađite o ovim osobinama na ." #. (title) @@ -4347,7 +4347,7 @@ msgstr "Lokalni fajl već postoji" #. (para) #: ../source/TortoiseGit_en.xml:4881 -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." msgstr "Ponekad dok pokuÅ¡avate da ažurirate, ažuriranje ne uspe sa porukom koja kaže da već postoji fajl sa istim imenom u vaÅ¡em radnom imeniku. Subverzija nikada neće preklopiti neverzionisani fajl - on može sadržati neÅ¡to na čemu radite, Å¡to slučajno ima isto ime koje je drugi čovek iz razvoja uzeo za svoj novo urezani fajl." #. (para) @@ -4397,19 +4397,19 @@ msgstr "filename.ext.rNEWREV" #. (para) #: ../source/TortoiseGit_en.xml:4960 -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." msgstr "ovo je fajl koji je vaÅ¡ Subverzioni klijent upravo primio sa servera kada ste ažurirali vaÅ¡u radnu kopiju. Ovaj fajl odgovara GLAVNOJ reviziji spremiÅ¡ta." #. (para) #: ../source/TortoiseGit_en.xml:4915 msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " +" Also, for every conflicted file Git places three additional files in your directory: " msgstr "" "Jednom ćete dobiti konflikt dok ažurirate vaÅ¡e fajlove iz spremiÅ¡ta. Konflikt se javlja kada dva ili viÅ¡e ljudi izmene isto nekoliko linija fajla. Kako Subverzija nezna niÅ¡ta o vaÅ¡em projektu, ona ostavlja reÅ¡avanje konflikta ljudima. Kadgod se konflikt iznese treba da otvorite fajl u pitanju i potražite linije koje počinju stringom <<<<<<<. Konfliktna oblast je markirana kao ovo: \n" "<<<<<<< filename\n" @@ -4431,7 +4431,7 @@ msgstr "Posle izvrÅ¡enja komande TortoiseGitfilename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." msgstr "Ako imate konflikt sa binarnim fajlovima, Subverzija ne pokuÅ¡ava da stopi same fajlove. Lokalni fajl ostaje neizmenjen (tačno kao Å¡to ste ga izmenili) i vi imate filename.ext.r* fajlove. Ako želite da odbacite svoje izmene i zadržite verziju iz spremiÅ¡ta, samo iskoristite komandu Vrati. Ako želite da zadržite vaÅ¡u verziju i da prepiÅ¡ete verziju spremiÅ¡ta, koristite komandu ReÅ¡i, i urežite svoju verziju." #. (para) @@ -4480,13 +4480,13 @@ msgstr "ikone" #. (para) #: ../source/TortoiseGit_en.xml:5046 -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." +msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." msgstr "Sada imate da preuzmete radnu kopiju iz Subverzionog spremiÅ¡ta možete videti svoje fajlove u vindouz eksploreru sa izmenjenim ikonama. Ovo je rezon zaÅ¡to TortoiseGit tako popularan. TortoiseGit dodaje takozvane prekrivne ikone za svaku fajl ikonu koja prekriva originalnu ikonu fajla. Zavisno o Subverzionom stanju fajl prekrivna ikona se razlikuje." #. (para) #: ../source/TortoiseGit_en.xml:5054 -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " Sveže preuzeta radna kopija ima zelen čekmarku kao prekrivač. To znači da je Subverzioni status normalan." +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." +msgstr " Sveže preuzeta radna kopija ima zelen čekmarku kao prekrivač. To znači da je Subverzioni status normalan." #. (para) #: ../source/TortoiseGit_en.xml:5059 @@ -4500,12 +4500,12 @@ msgstr " Ako se tokom ažuriran #. (para) #: ../source/TortoiseGit_en.xml:5072 -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." msgstr " Ako ste podesili svn:needs-lock osobine fajla, Subverzija čini fajl samo za čitanje dok zaključate fajl. Takvi fajlovi imaju ovaj prekrivač da označi da ste otključali najpre pre nego uređujete fajl." #. (para) #: ../source/TortoiseGit_en.xml:5079 -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." msgstr " Ako držite zakčan fajl i Subverzioni status je normalan, ovaj prekrivač ikona vas podseća da treba otključati fajl ako ga ne koristite da omogućite drugim korisnicima da urezuju svoje izmene u taj fajl." #. (para) @@ -4540,7 +4540,7 @@ msgstr "Sada ima viÅ¡e Tortoise klijenta okolo (TortoiseCVS, TortoiseHG, ...) gr #. (para) #: ../source/TortoiseGit_en.xml:5124 -msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." +msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." msgstr "Za opis kako ikone prekrivači odgovaraju Subverzionom statusu i ostale tehničke detalje pročitaj ." #. (title) @@ -4977,7 +4977,7 @@ msgstr "Kopira detalje dnevnika o izabranim revizijama za klipbord. Ovo će kopi #. (para) #: ../source/TortoiseGit_en.xml:5742 -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." msgstr "Pretražuje dnevnik poruka za tekst koji ste uneli. To pretražuje dnevnik poruka koje ste uneli i takođe zbirnu akciju kreiranu Subverzijom (prikazan u donjem panelu). Pretraživanje ne zavisi od veličine slova." #. (para) @@ -5064,7 +5064,7 @@ msgstr "Vratiti izmene učinjene izabranim fajlovima u toj reviziji." #. (para) #: ../source/TortoiseGit_en.xml:5843 -msgid "View the Subversion properties for the selected item." +msgid "View the Git properties for the selected item." msgstr "Vidi Subverzijine osobine za izabranu stavku." #. (para) @@ -5089,17 +5089,17 @@ msgstr "Možete zapaziti da ponekad govorimo o izmenama a drugi put o razlikama. #. (para) #: ../source/TortoiseGit_en.xml:5865 -msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." +msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." msgstr "Subverzija koristi revizione brojeve da označi 2 različite stvari. Revizija generalno predstavlja stanje spremiÅ¡ta u vremenskom trenutku, ali može takođe, biti korišćena da predstavi skup izmena koji je kreirala ta revizija, npr. quote>Dato u r1234 znači da su izmene urezane u r1234 implementiraju osobinu X. Da se to učini jasnim koji osećaj je korišćen, koristimo dva različita termina." #. (para) #: ../source/TortoiseGit_en.xml:5874 -msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." +msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." msgstr "Ako izabrete dve revizije N i M, kontekst meni će ponuditi da prikaže razlike između te dve revizije. U Subverzijinim terminima to je diff -r M:N." #. (para) #: ../source/TortoiseGit_en.xml:5880 -msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." +msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "Ako izaberete pojedinačnu reviziju N, kontekst meni će ponuditi da prikaže izmene napravljene u toj reviziji. U Subverzijinim terminima to je diff -r N-1:N ili diff -c N." #. (para) @@ -5134,7 +5134,7 @@ msgstr "Kada je Prikaži Dnevnik dijalog pozvan u okviru Stopi dijaloga, boks je #. (para) #: ../source/TortoiseGit_en.xml:5935 -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." msgstr "Primetimo da Subverzija tekuće postavlja preimenovanje kao kopiraj/briÅ¡i par, tako preimenovanje fajla ili imenika će takođe, uzrokovati zaustavljanje displeja dnevnika ako je ova opcija čekirana." #. (para) @@ -5189,7 +5189,7 @@ msgstr "dnevnik spajanja praćenja" #. (para) #: ../source/TortoiseGit_en.xml:5990 -msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." +msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." msgstr "Subverzija 1.5 i kasnije čuvaju svedočanstvo o stapanju koristeći osobine. Ovo nam omogućava da dobijemo detaljniju istoriju stopljenih izmena. Na primer, ako razvijate nove osobine na grani i zatim stopite tu granu nazad u deblo, dalji razvoj će pokazati u dnevniku debla pojednačno urezivanje za stapanje, čak i ako možda ima 1000 urezivanja u toku razvoja grane." #. (title) @@ -5224,7 +5224,7 @@ msgstr "Ponekad možete poželeti da izmenite dnevnik poruku koju ste nekad unel #. (para) #: ../source/TortoiseGit_en.xml:6031 -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." msgstr "Subvezija vam dopuÅ¡ta da menjate dnevnik poruku i autora revizije kad god želite. Ali kako takve izmene ne mogu biti poniÅ¡tene (te izmene nisu verzionisane) ova osobina je podrazumevano onemogućena. Da se uradi ovaj posao, morate podesiti pre-revprop-izmene zakačaljku. Molim pogledajte poglavlje na Hook Scripts u Subverzionoj Knjizi za detalje kako da se to uradi. Pročitajte da nađete neke dalje beleÅ¡ke o primeni zakačaljki na Windows maÅ¡ini." #. (para) @@ -5234,7 +5234,7 @@ msgstr "Kada jedanput podesite svoj server sa željenim zakačaljkama, možete m #. (para) #: ../source/TortoiseGit_en.xml:6051 -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." msgstr "PoÅ¡to Subverzione revizione osobine nisu verzionisane, pravljenjem izmena u tim osobinama (na primer, svn:log poruka urezivanja osobina) će prekriti prethodnu vrednost osobine zauvek." #. (title) @@ -5284,7 +5284,7 @@ msgstr "Nema Dnevnika Formatiranja iz Pretraživača SpremiÅ¡ta" #. (para) #: ../source/TortoiseGit_en.xml:6119 -msgid "Because the formatting depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "Zato Å¡to formatiranje zavisi od pristupa subverzionim podeÅ¡avanjima, vi samo vidite rezultate kada koristite preuzimanje radne kopije. Dobavljanje osobina daljinski je sporo, tako ne možete videti ovu osobinu u akciji repo pretraživača." #. (title) @@ -5503,7 +5503,7 @@ msgstr "Razlike između RK fajl/imenik i URL" #. (para) #: ../source/TortoiseGit_en.xml:6382 -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." +msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." msgstr "Ako želite da vidite razlike između fajla u vaÅ¡oj radnoj kopiji, i fajl u bilo kojem Subverzionom spremiÅ¡tu, možete to uraditi direktno u pretraživaču izborom fajla zatim držeći Shift taster dok desnim klikom dobijete kontekst meni. Izaberite TortoiseGitDiff sa URL. Možete uraditi istu stvar za imenik radne kopije. TortoiseMerge prikazuje ove razlike na isti način kao Å¡to je prikazano u fajlu zakrpe - lista izmenjenih fajlova koje možete pregledati jedan po jedan." #. (term) @@ -5898,7 +5898,7 @@ msgstr "znak" #. (para) #: ../source/TortoiseGit_en.xml:6826 -msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Subversion." +msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." msgstr "Često se deÅ¡ava to da već imate fajlove koji su vam potrebni u drugom projektu u vaÅ¡em spremiÅ¡tu i jednostavno želite da ih kopirate unutar. Možete jednostavno kopirati fajlove i dodati ih kako je opisano gore, ali to vam neće dati istoriju. Ako subsekventno fiksirate bagove u originalnim fajlovima možete samo stopiti fiksirano automatski ako se nova kopija odnosi na originalnu Subverziju." #. (para) @@ -5983,7 +5983,7 @@ msgstr "Globalna lista zanemarivanja" #. (para) #: ../source/TortoiseGit_en.xml:6958 -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." msgstr "Drugi nčin da se zanemare fajlovi je da se dodaju u globalnu listu zanemarivanja. Velika razlika ovde je da je globalna lista zanemarivanja je klijentska osobina. Primenjuje se na sve Subverzione projekte, ali na samo na klijentovom PC. Generalno je bolje da se koristi svn:ignore osobina kada je moguće jer može biti primenjena na specifičnu oblast projekta, i to radi za svakog ko preuzme projekat. Pročitajte za viÅ¡e informacija." #. (title) @@ -5993,7 +5993,7 @@ msgstr "Zanemarivanje verzionisanih stavki" #. (para) #: ../source/TortoiseGit_en.xml:6972 -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." +msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "Verzionisani fajlovi i imenici ne mogu biti nikad zanemareni - to je osobina Subverzije. Ako verzioniÅ¡ete fajl greÅ¡kom pročitajte za instrukcije kako da ga odverzioniÅ¡ete." #. (title) @@ -6043,7 +6043,7 @@ msgstr "Čini sličnim bilo koji karakter zatvoren u srednjoj zagradi. U okviru #. (para) #: ../source/TortoiseGit_en.xml:6987 -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " msgstr "Subverzioni model zanemarivanja koristi globalisanje imena fajlova kao tehniku originalno korićenu u Uniksu da se specificiraju fajlovi koristeći meta-karaktere kao džokere. Sledeći karakteri imaju specijalna značenja: " #. (para) @@ -6078,7 +6078,7 @@ msgstr "Eksplorerov kontekst meni za verzionisane fajlove" #. (para) #: ../source/TortoiseGit_en.xml:7062 -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " +msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " msgstr "Suprotno CVS, Subverzija dozvoljava preimenovanje i pomeranje fajlova i imenika. Tako da ima meni ulaza za brisanje i preimenovanje u TortoiseGit submeniju. " #. (title) @@ -6098,7 +6098,7 @@ msgstr "ukloni" #. (para) #: ../source/TortoiseGit_en.xml:7079 -msgid "Use TortoiseGitDelete to remove files or folders from subversion." +msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "Koristi TortoiseGitBriÅ¡i da se uklone fajlovi i imenici iz subverzije." #. (para) @@ -6108,7 +6108,7 @@ msgstr "Kada uradite TortoiseGitBri #. (para) #: ../source/TortoiseGit_en.xml:7103 -msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseGit." +msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." msgstr "Kada TortoiseGitBriÅ¡i imenik, ostaje u vaÅ¡oj radnoj kopiji, ali se prekrivač menja da indicira da je markiran za brisanje. Sve dok ne urežete izmene možete vratiti imenik koristeći TortoiseGita NVrati na sam imenik. Ova razlika u ponaÅ¡anju među fajlovima i imenicima je deo Subverzije, ne TortoiseGit." #. (para) @@ -6118,12 +6118,12 @@ msgstr "Ako želite da obriÅ¡ete stavku iz spremiÅ¡ta, ali da je zadržite lokal #. (para) #: ../source/TortoiseGit_en.xml:7131 -msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Subversion doesn't have to guess what you really want to do." +msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." msgstr "Ako je fajl obrisan preko pretraživača umesto korišćenjem TortoiseGit kontekst menija, dijalog urezivanja prikazuje te fajlove i dozvoljava vam da ih uklonite iz kontrole verzija pre urezivanja takođe. Međutim, ako ažurirate vaÅ¡u radnu kopiju, Subverzija će obeležiti fajl koji nedostaje i zameniti ga sa zadnjom verzijom iz spremiÅ¡ta. Ako vam treba da obriÅ¡ete verzija-kontrolisan fajl, uvek koristite TortoiseGitBriÅ¡i tako da Subverzija ne mora da pogađa Å¡ta vi stvarno želite da uradite." #. (para) #: ../source/TortoiseGit_en.xml:7145 -msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." +msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." msgstr "Ako je imenik izbrisan preko pretraživača umesto koristići TortoiseGit kontekst meni, vaÅ¡a radna kopija će biti oÅ¡tećena i vi nećeti moći da je urežete. Ako ažurirate vaÅ¡u radnu kopiju Subverzija će zameniti nedostajući imenik sa zadnjom verzijom iz spremiÅ¡ta i možete ga tada obrisati na ispravan način koristeći TortoiseGitObriÅ¡i." #. (title) @@ -6217,12 +6217,12 @@ msgstr "izmena velikih i malih slova" #. (para) #: ../source/TortoiseGit_en.xml:7274 -msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." +msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "Praveći izmene u veličini slova u fajlimenu je trik sa Subverzijom u Vindouzu, jer u kratkom periodu u toku preimenovanja, oba fajlimena postoje. Kako Vindouz ima fajl sistem nezavisan od veličine slova ovo ne radi korišćenjem obične Preimenuj komande." #. (para) #: ../source/TortoiseGit_en.xml:7280 -msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!" +msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" msgstr "Srećom postoji (najmanje) dva moguća metoda za preimenovanje fajla bez gubtka njegove istorije. Važno je da se on preimenuje u okviru subverzije. Samo preimenovanje u pretraživaču pokvariće vaÅ¡u radnu kopiju!" #. (para) @@ -6274,7 +6274,7 @@ msgstr "Rad sa konfliktom veličine slova u imenu fajla" #. (para) #: ../source/TortoiseGit_en.xml:7336 -msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Subversion supports case-sensitive filenames, Windows does not." +msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." msgstr "Ako spremiÅ¡te već sadrži dva fajla sa istim imenom koji se razlikuju samo u veličini slova (npr. TEST.TXT i test.txt), vi nećete moći da ažurirate ili preuzmete predački imenik na Vindouz klijentu. PoÅ¡to Subverzija podržava fajlimena zavisna od veličine slova, Vindouz to ne radi." #. (para) @@ -6304,12 +6304,12 @@ msgstr "Ispravka preimenovanja fajlova" #. (para) #: ../source/TortoiseGit_en.xml:7368 -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." msgstr "Ponekad vaÅ¡ prijateljski IDE će preimenovati fajlove za vas kao deo pravljenja primera, i svakako to ne kaže Subverziji. Ako pokuÅ¡ate da urežete svoje izmene Subverzija će videti stara fajlimena kao nedostajuća i nova kao neverzionisane fajlove. Možete samo proveriti novo fajlime da dodate ali tada gubite sliku istorije poÅ¡to Subverzija nezna fajlove na koje se odnosi. " #. (para) #: ../source/TortoiseGit_en.xml:7376 -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "Bolji način je da se notira Subverzija da su ove izmene u stvari preimenovanja i možete to uraditi u okviru Ureži i Proveri Modifikaciju dijalog. Jednostavno izaberite staro ime (nedostaje) i novo ime (neverzionisano) i koristite Kontekst MeniPopravi Pomeri da uparite dva fajla kao preimenovanje." #. (title) @@ -6319,7 +6319,7 @@ msgstr "Brisanje neverzionisanih fajlova" #. (para) #: ../source/TortoiseGit_en.xml:7391 -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." msgstr "Obično podeÅ¡avate listu zanemarivanja tako da su svi generisani fajlvi zanemareni u Subverziji. Ali Å¡ta ako želite da očistite sve zanemarene stavke da bi izradili čistu gradnju? Obično to podeÅ¡avate u mejkfajlu ali ako debagujete mejkfajl ili menjanjem sistema izgradnje korisno je da se ima način čišćenja platforme." #. (para) @@ -6414,12 +6414,12 @@ msgstr "čišćenje" #. (para) #: ../source/TortoiseGit_en.xml:7493 -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." msgstr "Ako Subverziona komanda ne može da se zavrÅ¡i uspeÅ¡no, moguće zbog problema na serveru, vaÅ¡a radna kopija biće ostavljena u nekonzistentnom stanju. U tom slučaju treba da koristite TortoiseGitČišćenje na imeniku. To je dobra ideja da se uradi na vrÅ¡nom nivou radne kopije." #. (para) #: ../source/TortoiseGit_en.xml:7504 -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." msgstr "Čišćenje ima i drugi propratni efekat. Ako je datum fajla promenjen a sadržaj nije, Subverzija ne može reći da li je zaista izmenjen osim proverom bajt-po-bajt sa čistom kopijom. Ako imate puno fajlova u ovom stanju provera statusa je vrlo spora Å¡to će uraditi puno dijaloga sporo odgovaranje. IzvrÅ¡avanjem Čišćenja na radnoj kopiji popraviće poremećene vremenske markere i povratiti status provere punom brzinom." #. (title) @@ -6429,7 +6429,7 @@ msgstr "Koristi vremenske markere urezivanja" #. (para) #: ../source/TortoiseGit_en.xml:7516 -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." msgstr "Neke ranije realizacije Subverzije su imale bag koji je uzrokovao onflikt vremenskih markera kada ih proveravate sa Koristi urezivanje vremenskih markera proverom opcija. Koristite Čišćenje komandu da ubrzate ove radne kopije. " #. (title) @@ -6444,37 +6444,37 @@ msgstr "osobine" #. (title) #: ../source/TortoiseGit_en.xml:7532 -msgid "Explorer property page, Subversion tab" +msgid "Explorer property page, Git tab" msgstr "Vlasnički list eksplorera, Subverzioni tab" #. (para) #: ../source/TortoiseGit_en.xml:7530 -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." msgstr " Ponekad želite da imate detaljnije informacije o fajl/imenik nego Å¡to je prekrivna ikona. Možete dobiti sve informacije koje Subverzija daje u dijalogu osobina pretraživača. Samo izaberite fajl ili imenik i izaberite Vindouz MeniOsobine u kontekst meniju (primedba: to je normalan meni osobina ulaz koji daje pretraživač, nije deo TortoiseGit submenija!). U dijalogu osobina TortoiseGit dodaje novu stranu osobina za fajlove/imenike pod Subverzijinom kontrolom, gde možete videti relevantne informacije o izabranom fajlu/imeniku." #. (title) #: ../source/TortoiseGit_en.xml:7552 -msgid "Subversion Properties" +msgid "Git Properties" msgstr "Subverzione osobine" #. (primary) #: ../source/TortoiseGit_en.xml:7554 -msgid "Subversion properties" +msgid "Git properties" msgstr "Subverzione osobine" #. (title) #: ../source/TortoiseGit_en.xml:7560 -msgid "Subversion property page" +msgid "Git property page" msgstr "Subverzioni vlasnički list" #. (para) #: ../source/TortoiseGit_en.xml:7558 -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." +msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." msgstr " Možete čitati i podesiti Subverzione osobine iz Vindouz osobine dijaloga, ali takođe iz TortoiseGitosobine i u okviru TortoiseGit statusne liste iz Kontekst meniosobine." #. (para) #: ../source/TortoiseGit_en.xml:7575 -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." +msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." msgstr "Možete dodatu vaÅ¡e lične osobine, ili neke osobine sa specifičnim značenjem u Subverziji. To Å¡to počinje sa svn:. svn:externals je takva osobinač vidite kako se rukuje eksternalima u xref linkend=\"tsvn-dug-import-4\"/>." #. (title) @@ -6519,17 +6519,17 @@ msgstr "Komprimovana kombinacija prethodne četiri ključne reči." #. (para) #: ../source/TortoiseGit_en.xml:7589 -msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " +msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "Subverzija podržava CVS-slične proÅ¡irenje ključnih reči koje se mogu koristiti da uglave fajlime i revizionu informaciju u sam fajl. Ključne reči trenutno podržane su: " #. (para) #: ../source/TortoiseGit_en.xml:7640 -msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." +msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." msgstr "Da biste naÅ¡li kako da koristite ključne reči pogledajte na svn:keywords section u Subverzionoj knjizi, koja vam daje pun opis ovih ključnih reči i kako ih omogućiti i koristiti." #. (para) #: ../source/TortoiseGit_en.xml:7650 -msgid "For more information about properties in Subversion see the Special Properties." +msgid "For more information about properties in Git see the Special Properties." msgstr "Dalje informacije o svnservu mogu se naći na Specijalne osobine." #. (title) @@ -6634,12 +6634,12 @@ msgstr "auto-osob" #. (para) #: ../source/TortoiseGit_en.xml:7768 -msgid "You can configure Subversion and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." +msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." msgstr "Možete konfigurisati Subverziju i TortoiseGit da podesite osobine automatski na fajlovima i imenicima kada se oni dodaju u spremiÅ¡te. Postoji dva načina da se to uradi." #. (para) #: ../source/TortoiseGit_en.xml:7773 -msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." +msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." msgstr "Možete urediti subverzioni konfiguracioni fajl da omogućite ovu osobinu na klijentu. Generalna strana TortoiseGit podeÅ¡avanja dijalog ima dugme za uređenje da ga pokrenete direktno. Konfig fajl je jednostavan tekst fajl koji kontroliÅ¡e neke od subverzionih delovanja. Potrebno je da izmenite dve stvari: najpre u zaglavlju paragrafa asortiman otkomentirajte liniju enable-auto-props = yes. Drugo, potrebno je da uredite paragraf ispod da definiÅ¡e koje osobine želite da dodate na koji tip fajla. Ovaj metod je standardna subverziona osobina i radi sa bilo kojim subverzionim klijentom. Međutim to je definisano kod svakog klijenta individualno - nema načina da se prenese ovo podeÅ¡avanje iz spremiÅ¡ta." #. (para) @@ -6664,7 +6664,7 @@ msgstr "Urezivanje osobina" #. (para) #: ../source/TortoiseGit_en.xml:7810 -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." +msgid "Git properties are versioned. After you change or add a property you have to commit your changes." msgstr "Subverzione osobine su verzionisane. Posle izmena ili dodavanja osobina treba da urežete vaÅ¡e izmene." #. (title) @@ -6674,7 +6674,7 @@ msgstr "Konflikt u osobinama" #. (para) #: ../source/TortoiseGit_en.xml:7817 -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." msgstr "Ako postoji konflikt pri urezivanju izmena, zato Å¡to drugi korisnik ima izmenjene iste osobine, Subverzija generiÅ¡e .prej fajl. ObriÅ¡ite ovaj fajl posle razreÅ¡enja konflikta." #. (title) @@ -6714,7 +6714,7 @@ msgstr "tsvn:logtemplate se koristi sa projektima koji imaju #. (para) #: ../source/TortoiseGit_en.xml:7882 -msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." +msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." msgstr "Subverzija vam omogućava da podesite autoprops koji će biti primenjen na novo dodate ili uvezene fajlove, zasnovane na ekstenziji fajla. Ovo zavisi na svakom klijentu koji ima podeÅ¡en odgovarajuči autoprops u svom subverzionom konfiguracionom fajlu. tsvn:autoprops može biti podeÅ¡en na imeniku i to će biti stopljeno sa korisničkim lokalnim autoprops kada se uvezu ili dodaju fajlovi. Format je isti kao i za subverzioni autoprops, npr. *.sh = svn:eol-style=native;svn:executable podeÅ¡ava dve osobine na fajlovima sa .sh ekstenzijom." #. (para) @@ -6801,7 +6801,7 @@ msgstr "Kada dodate novi sub-imenik koristeći TortoiseGit, osobine bilo kog pro #. (para) #: ../source/TortoiseGit_en.xml:8015 -msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." +msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." msgstr "Takođe TortoiseGit osobine projekta su izuzetno korisne, one samo rade sa TortoiseGit, i neki će samo raditi u novoj verziji TortoiseGit. Ako ljudi rade na vaÅ¡em projektu koristite mnoÅ¡tvo Subverzionih klijenata, ili moguće ako imate staru verziju TortoiseGit, možete da koristite zakačaljke spremiÅ¡ta da forsirate politiku projekta. Osobine projekta mogu pomoći da se primeni politika, ona se ne može forsirati. " #. (title) @@ -6833,7 +6833,7 @@ msgstr "Druga osobina sistema kontrole verzija je mogućnost da se markira posbn #. (para) #: ../source/TortoiseGit_en.xml:8058 -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." msgstr "Subverzija nema specijalne komande za grananje i označavanje, ali koristi takozvane jeftine kopije umesto. Jeftine kopije su slične čvrstim vezama na Juniksu, koje znače to da se umesto pravljenja kompletnih kopija u spremiÅ¡tu, interna veza se kreira, ukazujući na specifično stablo/reviziju. Kao rezultat grane i značke se vrlo brzo kreiraju, i skoro da ne uzimaju dodatni prostor u spremiÅ¡tu." #. (title) @@ -6980,7 +6980,7 @@ msgstr "Ako izmenite radnu kopiju kreiranu od grane i urežete, zatim sve izmene #. (para) #: ../source/TortoiseGit_en.xml:8245 -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " msgstr "Takođe, sama Subverzija ne pravi razliku između znački i grana, način kako se tipično koriste razlikuje se u malom. " #. (title) @@ -7006,7 +7006,7 @@ msgstr "Tamo gde se grane koriste da održavaju odvojene linije razvoja, u nekim #. (para) #: ../source/TortoiseGit_en.xml:8299 -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." +msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." msgstr "Važno je razumeti kako grane i stapanje rade na Subverziji pre početka njihovog korišćenja, jer može biti sasvim kompleksno. Jako se preporučuje da pročitate poglavlje Branching and Merging u Subverzionoj knjizi, koja daje pun opis i mnogo primera kak se korist." #. (para) @@ -7036,7 +7036,7 @@ msgstr "Metoda se koristi u slučaju kad ste napravili jednu ili viÅ¡e revizija #. (para) #: ../source/TortoiseGit_en.xml:8342 -msgid "What you are asking Subversion to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." +msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." msgstr "Kako pitate Subverziju da to uradi: Izračunati izmene neophodne da uzmete [OD] revizije 1 grane A [DO] revizije 7 grane A, primenite ove izmene u mojoj radnoj kopiji (deblo ili grana B)." #. (term) @@ -7048,12 +7048,12 @@ msgstr "ReintegriÅ¡i granu" #. (para) #: ../source/TortoiseGit_en.xml:8353 -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." +msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." msgstr "Ovaj metod pokriva slučaj kada ste uradili posebnu granu Å¡to je razmatrano u Subverzionoj knjizi. Sve izmene debla su provedena u posebnoj grani, nedelja po nedelju, i sada je posebnost kompletno ono Å¡to želite da stopite nazad u deblo. PoÅ¡to hoćete da zadržite posebnu granu sinhroniziranu sa deblom, zadnja verzija grane i debla će biti apsolutno identične osim za vaÅ¡e izmene grane." #. (para) #: ../source/TortoiseGit_en.xml:8362 -msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Subversion to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." +msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "Ovo je specijalni slučaj stapanja stabla opisan dole, i on zahteva samo URL da stopi (normalno) vaÅ¡u granu razvoja. Koristi praćenje stapanja osobinu Subverzije da izračuna ispravni revizioni opseg za korišćenje, i omogućava dodatnu proveru koja omogućava da je ta grana potpuno ažurirana izmenom debla. Ovo omogućava da vi ne poniÅ¡tite grÅ¡kom rad koji su drugi urezali u deblo od vaÅ¡e zadnje sihronizovane izmene." #. (para) @@ -7073,12 +7073,12 @@ msgstr "Stopi dva različita stabla" #. (para) #: ../source/TortoiseGit_en.xml:8392 -msgid "This is a more general case of the reintegrate method. What you are asking Subversion to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." +msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." msgstr "Ovo je mnogo opÅ¡tiji slučaj reintegracionog metoda. Ono Å¡to pitate Subverziju da to uradi je: Izračunajte izmene neophodne da dobijete [OD] glavne revizije debla [DO]glavne revizije grane,i primeniti te izmen na moju radnu kopiju (debla). čist rezultat je to deblo sada izgleda tačno kao grana." #. (para) #: ../source/TortoiseGit_en.xml:8400 -msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Subversion Book." +msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." msgstr "Ako vaÅ¡ server/spremiÅ¡te ne podržava stapanje-praćenje onda je ovo jedini način da se stopi grana nazad u deblo. Sledeći slučaj korišćenja se javlja kada koristite prodajne grane i potrebno vam je da stopite izmene koje prate novi prodajni pad u vaÅ¡ kod debla.Za viÅ¡e informacija pročitajte poglavlje vendor branches u Subverzionoj kljizi." #. (title) @@ -7123,7 +7123,7 @@ msgstr "Sa TortoiseGit vi specificirate izmenljivskup da se stopi koristeći to find out more." +msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." msgstr "Ako koristite praćenje stapanja osobinu Subverzije, ne treba vam da pamtite koje revizije su već stopljene - Subverzija beleži to za vas. Ako ostavite revizioni opseg praznim, sve revizije koje joÅ¡ niste stopili biće uključene. Pročitajte da nađete viÅ¡e o tome." #. (para) @@ -7243,7 +7243,7 @@ msgstr "Morate odrediti dubinu koju ćete koristiti za stapanje, npr. koliko dal #. (para) #: ../source/TortoiseGit_en.xml:8618 -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" msgstr "NajviÅ¡e vremena vi želite da stapanje uzme u obzir istoriju fajla, tako da izmene relativne zajedničkom prethodniku su stopljene. Ponekad vam je potrebno da stopite fajlove koji možda zavise, ali nisu u vaÅ¡em spremiÅ¡tu. Na primer možda ste uvezli verzije 1 i 2 biblioteke trećeg lica u dva odvojena imenika.Takođe, oni su logički zavisni, Subverzija nema znanja o tome jer samo vidi loptu koju unesete. Ako pokuÅ¡ate da stopite razlike ta dva stabla videćete kompletno uklanjanje kome sledi kompletno dodavanje. Da učinite da Subverzija koristi samo zasnovane na putanji razlike pre nego istorijski-zasnovane razlike, čekirajte guilabel>Zanemari poreklo boks. Pročitajte viÅ¡e o ovome u Subverzionoj knjizi, Noticing or Ignoring Ancestry" #. (para) @@ -7278,12 +7278,12 @@ msgstr "Stapanje je sada kompletno. Dobra je ideja da se pogleda na stapanje i v #. (para) #: ../source/TortoiseGit_en.xml:8679 -msgid "For Subversion clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." +msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." msgstr "Za Subverzione klijente i servere pre 1.5, nisu stopi informacije uskladiÅ¡tene i stopljene revizije su praćene ručno. Kada ste testirali izmene i doÅ¡li do urezivanja ove revizije, vaÅ¡ dnevnik poruka urezivanja treba uvek da obuhvati revizione brojeve koji su preneti u stapanju. Ako želite da primenite sledeće stapanje kasnije potrebno vam je da znate Å¡ta ste već stopili, jer ne želite da prenesete izmene viÅ¡e nego jednom. Za viÅ¡e informacija o tome pogledajte Best Practices for Merging u Subverzijinoj knjizi." #. (para) #: ../source/TortoiseGit_en.xml:8696 -msgid "If your server and all clients are running Subversion 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." +msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "Ako vaÅ¡ server i svi klijenti rade Subverziju 1.5 ili viÅ¡u, praćenje stapanja mogućnost će zabeležiti revizije stoljene i izostaviti revizije koje su stopljene viÅ¡e od jedanput. Ovo čini vaÅ¡ život mnogo jednostavnijim kao kad jednostavno stopite celi revizioni opseg svaki put i znate da samo nova revizija će stvarno biti stopljena." #. (para) @@ -7298,7 +7298,7 @@ msgstr "Ako ste upravo stopili posebnu granu nazad u deblo, deblo sada sadrži s #. (para) #: ../source/TortoiseGit_en.xml:8718 -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." +msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." msgstr "Subverzija ne može stopiti fajl sa imenikom i obratno - samo imenici sa imenicima i fajlovi sa fajlovima. Ako kliknete na fajl i otvorite dijalog stapanja, zatim možete zadati putanju do fajla u dijalogu. Ako izaberete i pokrenete dijalog morate specificirati imenik URL za stapanje." #. (title) @@ -7338,7 +7338,7 @@ msgstr "Možete obeležiti reviziju kao ne stapaj uključuj #. (para) #: ../source/TortoiseGit_en.xml:8732 -msgid "Subversion 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " +msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " msgstr "Subverzija 1.5 uvodi mogućnost za praćenje stapanja. Kada se vaÅ¡e stapanje menja sa jednog stabla na drugo, revizioni brojevi stopljeni su uskladiÅ¡teni i ta informacija može biti korišćena za viÅ¡e različitih svrha. " #. (para) @@ -7348,8 +7348,8 @@ msgstr "Praćenje stapanja informacija je uskladiÅ¡tena u svn:mergeinfo #. (para) #: ../source/TortoiseGit_en.xml:8784 -msgid "Find out more about merge tracking from Subversion's Merge tracking documentation." -msgstr "Nađite viÅ¡e o praćenju stapanja iz Subverzione Merge tracking documentation." +msgid "Find out more about merge tracking from Git's Merge tracking documentation." +msgstr "Nađite viÅ¡e o praćenju stapanja iz Subverzione Merge tracking documentation." #. (title) #: ../source/TortoiseGit_en.xml:8792 @@ -7463,17 +7463,17 @@ msgstr "VaÅ¡a kompanija je uvek koristila zaključan sistema kontrole verzija u #. (para) #: ../source/TortoiseGit_en.xml:8918 -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " msgstr "Subverzija generalno radi najbolje bez zaključavanja, koristeći Kopiraj-Izmeni-Stopi metode opisane ranije u . Ipak, postoji nekoliko primera kada možete imati potrebu da primenite neku vrstu politike zaključavanja. " #. (para) #: ../source/TortoiseGit_en.xml:8942 -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." +msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." msgstr "Najpre treba obezbediti da Subverzioni server dograđen najmanje na verziju 1.2. Ranije verzije uopÅ¡te ne podržavaju zaključavanje. Ako koristite file:// pristup, svakako samo vaÅ¡ klijent treba da bude ažuriran." #. (title) #: ../source/TortoiseGit_en.xml:8949 -msgid "How Locking Works in Subversion" +msgid "How Locking Works in Git" msgstr "Kako zaključavanje radi na Subverziji" #. (para) @@ -7488,7 +7488,7 @@ msgstr "Ako vi Stavite Katanac na fajl, onda samo vi mož #. (para) #: ../source/TortoiseGit_en.xml:8963 -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." msgstr "Međutim, drugi korisnici neće neophodno znati da ste uklonili katanac. Osim da provere status zaključavanja regularno, najpre oni moraju znati o tome kada urezivanje utkaže, Å¡to u većini slučajeva nije mnogo krisno. Da biste učinili to lakÅ¡im za manipulaciju postoji nova Subverziona osobina svn:needs-lock. Kada je ova osobina podeÅ¡ena (na bilo koju vrednost) na fajlu, kadgod se fajl preuzima ili ažurira, lokalna kopija postaje samo za čitanje osim ako ta radna kopija drži katanac za fajl. Ovo deluje kao upozorenje tako da ne možete uređivati taj fajl osim ako najpre ne dobijete katanac. Fajlovi koji su verzionisani i samo za čitanje označeni su specijalnim prekrivačem u TortoiseGit da ukažu da treba da dobijete katanac pre uređenja." #. (para) @@ -7498,7 +7498,7 @@ msgstr "Zaključavanje je upisano u lokaciji radne kopije kao i vlasnik. Ako ima #. (para) #: ../source/TortoiseGit_en.xml:8985 -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." msgstr "Ako jedan od vaÅ¡ih saradnika traži katanac i ode na odmor bez otključavanja Å¡ta da se radi? Subverzija omogućava način da se forsira zaključavanje. Otključavanje od joÅ¡ nekog označeno je kao Razbijanje katanca, a nasilno otključavanje koje neko uradi zove se Krađa katanca. Prirodno, ovo nisu stvari koje treba da radite olako ako želite da ostanete prijatelj sa saradnicima" #. (para) @@ -7568,7 +7568,7 @@ msgstr "Izbegavanje razbijanja i krađa katanca" #. (para) #: ../source/TortoiseGit_en.xml:9086 -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." msgstr "Ako slomite ili ukradete nekom drugom katanac bez pitanja možete potencijalno uzrokovati gubitak posla. Ako radite sa nestopivim tipom fajlva i nekom ukradete katanac kada vratite katanac oni su slobodni da provere svoje izmene i prekriju vaÅ¡e. Subverzija ne gubi podatke ali vi možete izgubiti radnu zaÅ¡titu tima koje va zaključavanje omogućava." #. (title) @@ -7583,7 +7583,7 @@ msgstr "Kako je napomenuto gore, mnogo efektivniji način za korišćenje zaklju #. (para) #: ../source/TortoiseGit_en.xml:9109 -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." msgstr "Ako radite sa politikom da svaki fajl može biti zaključan tada možda shvatite da je lakÅ¡e da koristite Subverzionu suto-props osobinu da podesite osobine automatski svaki put kad dodajete novi fajl. Pročitajte za dalje informacije." #. (title) @@ -7593,7 +7593,7 @@ msgstr "Zakačive skripte za zaključavanje" #. (para) #: ../source/TortoiseGit_en.xml:9119 -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." msgstr "Kada kreirate novo spremiÅ¡te sa Subverzijom 1.2 ili viÅ¡om, četiri modela zakačaljki se kreira u spremiÅ¡tu zakačaljke imenik.One se pozivaju pre i posle postavljanja katanca i pre i posle skidanja katanca." #. (para) @@ -8260,7 +8260,7 @@ msgstr "Možete takođe stopiti izmene u izabranim revizijama u različitim radn #. (para) #: ../source/TortoiseGit_en.xml:9967 -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." msgstr "Zato Å¡to Subverzija ne može obezbediti sve informacije koje se traže izvestan deo interpretacije je potreban,koji ponekad daje čudne rzultate. Ipak, izlaz za deblo će generalno dati koristan rezultat." #. (para) @@ -8275,7 +8275,7 @@ msgstr "Ako koristite dnevnik keÅ¡ i mislite da je sadržaj poruke ili autor mo #. (title) #: ../source/TortoiseGit_en.xml:9996 -msgid "Exporting a Subversion Working Copy" +msgid "Exporting a Git Working Copy" msgstr "Izvoz Subverzione radne kopije" #. (primary) @@ -8330,7 +8330,7 @@ msgstr "Izvoz pojedinačnog fajla" #. (para) #: ../source/TortoiseGit_en.xml:10071 -msgid "The export dialog does not allow exporting single files, even though Subversion can." +msgid "The export dialog does not allow exporting single files, even though Git can." msgstr "Izvozni dijalog ne dopuÅ¡ta izvoz pojedinačnih fajlova, bez obzira Å¡to Subverzija može." #. (para) @@ -8427,7 +8427,7 @@ msgstr "Ovo je veoma retko korišćena operacija. Relokacio #. (para) #: ../source/TortoiseGit_en.xml:10171 -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." +msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." msgstr "Hoćete da pomerite različita Subverziona spremiÅ¡ta. U tom slučaju treba da izvrÅ¡ite čisto preuzimanje iz nove lokacije spremiÅ¡ta." #. (para) @@ -8472,7 +8472,7 @@ msgstr "bagtragač" #. (para) #: ../source/TortoiseGit_en.xml:10211 -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." msgstr "Veoma je često u Razvoju Softvera za izmene da imaju specifične bagove ili problem ID. Korisnici bag tragač sistema (problem tragač) su voleli da pridruže izmene koje su napravili u Subverziji sa specifičnim ID u njihovom problem tragaču. Većina problem tragača zbog toga omogućavaju pre-urezivanja zakačive skripte koje analiziraju dnevnik poruke da nađu bag ID sa kojim je urezivanje povezano. Ovo je ponekad sklono greÅ¡kama odkad je potrebno da korisnik upiÅ¡e dnevnik poruku ispravno tako da preurezivanja zakačiv skript može ga analizirati korektno." #. (para) @@ -8653,12 +8653,12 @@ msgstr "Nema Problem Tragač Informacije iz Pretraživača SpremiÅ¡ta" #. (para) #: ../source/TortoiseGit_en.xml:10518 -msgid "Because the issue tracker integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "Zato Å¡to problem tragač integracija zavisi od pristupa subverzionih osobina, vi ćete samo videti rezultate kada koristite preuzetu radnu kopiju. Dobavljanje osobina daljinski je sporo, tako ne možete videti ovu osobinu u akciji repo pretraživača." #. (para) #: ../source/TortoiseGit_en.xml:10525 -msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." +msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." msgstr "Problem tragač integracija nije ograničena na TortoiseGit; to može biti korišćeno sa bilo kojim Subverzionim klijentom. Za viÅ¡e informacija pročitajte potpunije Problem Tragač Integracija Specifikacija u TortoiseGit izvorno spremiÅ¡te. ( objaÅ¡njava kako da pristupite spremiÅ¡tu)." #. (title) @@ -8713,7 +8713,7 @@ msgstr "VebSVN" #. (para) #: ../source/TortoiseGit_en.xml:10588 -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." +msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." msgstr "Postoji viÅ¡e veb-zasnovanih pregledača spremiÅ¡ta dostupnih za korišćenje kao PregledajVC and ViewVC and WebSVNVebSVN. TortoiseGit omogućava način da povežete sa ovim pregledačem." #. (para) @@ -8743,7 +8743,7 @@ msgstr "Nema Repo Pregledač Veza iz Pretraživača SpremiÅ¡ta" #. (para) #: ../source/TortoiseGit_en.xml:10684 -msgid "Because the repo viewer integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." +msgid "Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "Zato Å¡to problem tragač integracija zavisi od pristupa subverzionih osobina, vi ćete samo videti rezultate kada koristite preuzetu radnu kopiju. Dobavljanje osobina daljinski je sporo, tako ne možete videti ovu osobinu u akciji repo pretraživača." #. (title) @@ -8778,7 +8778,7 @@ msgstr "Dijalog podeÅ¡avanja, opÅ¡ta stranica" #. (para) #: ../source/TortoiseGit_en.xml:10710 -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." +msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." msgstr " Ovaj dijalog omogućava da odredite svoj željeni jezik, i Subverziono-specifučna podeÅ¡avanja." #. (term) @@ -8848,12 +8848,12 @@ msgstr "Globalni modeli zanemarivanja su korišćeni da preduprede neverzionisan #. (para) #: ../source/TortoiseGit_en.xml:10792 -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." +msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." msgstr "Primetimo da se modeli zanemarivanja koje ste ovde specificirali takođe utiču na ostale Subverzione klijente koji rade na vaÅ¡em PC, uključujući klijente komandne linije." #. (para) #: ../source/TortoiseGit_en.xml:10798 -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." +msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." msgstr "Ako koristite Subverzioni konfiguracioni fajl da podesite global-ignores model, to će premostiti podeÅ¡avanje koje ste ovde uradili. Subverzioni konfiguracioni fajl je kontaktiran korišćenjem Uredi kako je objaÅ¡njeno u daljem tekstu." #. (para) @@ -8873,12 +8873,12 @@ msgstr "Ova opcija kaže TortoiseGit da podesi datum fajla na vreme zadnjeg urez #. (term) #: ../source/TortoiseGit_en.xml:10834 -msgid "Subversion configuration file" +msgid "Git configuration file" msgstr "Subverzijin konfiguracioni fajl" #. (para) #: ../source/TortoiseGit_en.xml:10836 -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." msgstr "Koristite Uredi da uredite Subverzioni konfiguracioni fajl direktno. neka podeÅ¡avanje se ne mogu izmeniti sa TortoiseGit, i traže da umesto toga budu podeÅ¡ena ovde. Za viÅ¡e informacija o Subverzionom konfig fajlu vidite Runtime Configuration Area. Poglavlje na Automatic Property Setting je od posebnog interesa, i ono je konfigurisano ovde. Primetimo da Subverzija može čitati konfiguracione informacije sa viÅ¡e mesta , i potrebno je da znate koji ima prioritet. Uporedite sa Configuration and the Windows Registry da nađete viÅ¡e o tome." #. (term) @@ -8888,12 +8888,12 @@ msgstr "Koristite _svnumesto .svn imen #. (para) #: ../source/TortoiseGit_en.xml:10863 -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." msgstr "VS.NET kada se koristi sa veb projektima ne može da rukuje sa .svn imenicima koje Subverzija koristi da smeÅ¡ta interne informacije. Ovo nije bag u Subverziji. Bag je u VS.NET i prednjoj strani koju koristi. Pročitajte da nađete viÅ¡e o ovom problemu." #. (para) #: ../source/TortoiseGit_en.xml:10870 -msgid "If you want to change the behaviour of Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this." +msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." msgstr "Ako želite da izmenite ponaÅ¡anje Subverzije i TortoiseGit, možete koristiti čekboks da podesite promenljive okoline koje to kontroliÅ¡u." #. (para) @@ -8993,7 +8993,7 @@ msgstr "Auto-zatvaranje ako nema konflikta dalje oslabljuje #. (para) #: ../source/TortoiseGit_en.xml:10993 -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." msgstr "Auto-zatvaranje ako nema greÅ¡aka uvek zatvara dijalog čak i ako je bio konflikata. Jedini uslov koji drži otvoren dijalog je uslov greÅ¡ke, Å¡to se javlja kada je Subverzija omogućenada kompletira zadatak. Na primer, ažuriranje je neuspeÅ¡no zato Å¡to je server nedostupan, ili urezivanje je neuspeÅ¡no zato Å¡to je radna kopija zastarela." #. (term) @@ -9363,13 +9363,13 @@ msgstr "Isključi Putanje se koristi da kaže TortoiseGit t #. (para) #: ../source/TortoiseGit_en.xml:11407 -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "f:\\development\\SVN\\Subversion će onemogućiti prekrivače samo na specifičnom imeniku. Vi joÅ¡ možete videti prekrivače na svim fajlovima unutar imenika." +msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "f:\\development\\SVN\\Git će onemogućiti prekrivače samo na specifičnom imeniku. Vi joÅ¡ možete videti prekrivače na svim fajlovima unutar imenika." #. (para) #: ../source/TortoiseGit_en.xml:11412 -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "f:\\development\\SVN\\Subversion* će onemogućiti prekrivače na sve fajlove i imenike čije putanje počinju sa f:\\development\\SVN\\Subversion. To znači da vi želite da vidite prekrivače za svaki fajl i imenik ispod putanje." +msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." +msgstr "f:\\development\\SVN\\Git* će onemogućiti prekrivače na sve fajlove i imenike čije putanje počinju sa f:\\development\\SVN\\Git. To znači da vi želite da vidite prekrivače za svaki fajl i imenik ispod putanje." #. (para) #: ../source/TortoiseGit_en.xml:11419 @@ -9471,7 +9471,7 @@ msgstr " Ovde možete konfigurisat vaÅ¡ proksi server, ako vam #. (para) #: ../source/TortoiseGit_en.xml:11514 -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." msgstr "Ako vam je potrebno da podesite po-spremiÅ¡tu proksi podeÅ¡avanja, potrebno je da koristite Subverzioni server fajl da konfiguriÅ¡e ovo. Koristi Uredi da dobijeÅ¡ to direktno. Konsultujte Runtime Configuration Area za detalje kako koristiti ovaj fajl." #. (para) @@ -9507,8 +9507,8 @@ msgstr "Da bi izbegli da budete pitani za lozinku neprestano možete takođe raz #. (para) #: ../source/TortoiseGit_en.xml:11564 -msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." -msgstr "Na kraju, podeÅ¡avanje SSH na serveru i klijentima je ne-trivijalan proces koji je van interesa ovog fajla pomoći. Međutim, možete naći vodič u TortoiseGit ČPP izlistanih pod Subversion/TortoiseGit SSH How-To." +msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." +msgstr "Na kraju, podeÅ¡avanje SSH na serveru i klijentima je ne-trivijalan proces koji je van interesa ovog fajla pomoći. Međutim, možete naći vodič u TortoiseGit ČPP izlistanih pod Git/TortoiseGit SSH How-To." #. (title) #: ../source/TortoiseGit_en.xml:11574 @@ -9603,7 +9603,7 @@ msgstr "Ako koristite svn:keywords osobinu da proÅ¡irite klju #. (para) #: ../source/TortoiseGit_en.xml:11680 -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." msgstr "Možete takođe specifirati različit diff alat da koriste Subverzione osobine. Kako ovo teži da bude skraćen jednostavan tekst string, vi možete želeti jednostavno mnogo kompaktniji pregled." #. (para) @@ -9780,7 +9780,7 @@ msgstr "Autentifikacioni podatak" #. (para) #: ../source/TortoiseGit_en.xml:11913 -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" msgstr "Kada se autentifikujete na Subverzioni server, korisničko ime i lozinka se keÅ¡iraju lokalno tako da ne morate da ih unosite. Možete želeti da obriÅ¡ete ovo iz sigurnosnih razloga, ili zato Å¡to želite da pristupite spremiÅ¡tu pod drugim korisničkim imenom ... da li DŽon zna da vi koristite njegov PC?" #. (para) @@ -10020,7 +10020,7 @@ msgstr "Dijalog podeÅ¡avanja, Zakačiv skript stranica" #. (para) #: ../source/TortoiseGit_en.xml:12154 -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." msgstr " Ovaj dijalog omogućava da podesite zakačive skripte koje će se izvrÅ¡iti automatski kada se izvesne Subverzione akcije izvrÅ¡avaju. Suprotno zakačivim skriptama objaÅ¡njenim u , ove skripte se izvrÅ¡avaju lokalno na klijentu." #. (para) @@ -10100,7 +10100,7 @@ msgstr "Pre-ažuriraj" #. (para) #: ../source/TortoiseGit_en.xml:12228 -msgid "Called before the actual Subversion update begins." +msgid "Called before the actual Git update begins." msgstr "Pozivana pre nego aktuelno Subverzono ažuriranje počne. " #. (term) @@ -10212,7 +10212,7 @@ msgstr "Primetimo takođe da imamo data imena tih parametarakonvencionalno, ne m #. (para) #: ../source/TortoiseGit_en.xml:12406 -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." +msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." msgstr "Ako želite da Subervezione operacije drže isključeno sve dok se zakačaljka kompletira, proverite Čekajte dok skript zavrÅ¡i." #. (para) @@ -10322,7 +10322,7 @@ msgstr "Sasvim retko korišćena podeÅ¡avanja su omogućena samo uređivanjem re #. (para) #: ../source/TortoiseGit_en.xml:12533 -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." +msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." msgstr "Možete specificirati različitu lokaciju za Subverzioni konfiguracioni fajl koristeći registri lokaciju HKCU\\Software\\TortoiseGit\\ConfigDir. Ovo će uticati na sve TortoiseGit operacije." #. (term) @@ -10387,7 +10387,7 @@ msgstr "Dnevnik dijalog osvetljava tekuću reviziju radne kopije kada je prikaza #. (title) #: ../source/TortoiseGit_en.xml:12623 -msgid "Subversion Working Folders" +msgid "Git Working Folders" msgstr "Subverzioni Radni Imenici" #. (primary) @@ -10402,7 +10402,7 @@ msgstr "_svn imenik" #. (para) #: ../source/TortoiseGit_en.xml:12630 -msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage extensions it uses." +msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." msgstr "VS.NET 2003 kada se koristi sa veb projektima ne može rukovati sa .svn imenicima koje Subverzija koristi da smesti interne informacije. Ovo nije bag u Subverziji. Bag je u VS.NET 2003 i ulazne stranice koje koristi kao proÅ¡irenje." #. (para) @@ -10412,7 +10412,7 @@ msgstr "Primetimo da je bag fiksiran u VS2005 i daljim verzijama." #. (para) #: ../source/TortoiseGit_en.xml:12641 -msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." msgstr "Od Verzije 1.3.0 Subverzije i TortoiseGit, možete podesiti promenljivu okruženja SVN_ASP_DOT_NET_HACK. Ako je ta promenljiva podeÅ¡ena Subverzija će koristiti _svn imenik umesto .svn imenik. Morate restartovati vaÅ¡u Å¡koljku za tu promenljivu okoline da postane efektna. Normalno to znači rebutovanje PC. Da se to olakÅ¡a, možete sada uraditi to sa stranice generalnog podeÅ¡avanja koristeći jednostavan čekboks - obratite se na ." #. (para) @@ -10467,7 +10467,7 @@ msgstr "broj verzije u fajlovima" #. (para) #: ../source/TortoiseGit_en.xml:12702 -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." msgstr "SubWCRev je Vindouz konzolni program koji se može koristiti da se pročita status Subverzione radne kopije i omogući zamena ključnih reči u fajl modelu. Ovo se često koristi kao deo procesa izrade u značenju unoÅ¡enja informacije radne kopije u objekat koji izrađujete. Tipično to može biti korišženo da se uključi revizioni broj u Opis programa boks." #. (title) @@ -10477,7 +10477,7 @@ msgstr "SubVCRev komandna linija" #. (para) #: ../source/TortoiseGit_en.xml:12717 -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." msgstr "SubWCRev čita Subverzioni status svih fajlova u radnoj kopiji, izostavljajući spoljaÅ¡nje uobičajeno. Zapisuje najveći nađen broj urezane revizije, i vremensku oznaku urezivanja te revizije. Takođe zapisuje da li postoje lokalne izmene u radnoj kopiji, ili pomeÅ¡ano ažurirane revizije. Revizioni broj, opseg ažuriranja revizija i status izmena su prikazani na stdout." #. (para) @@ -10975,7 +10975,7 @@ msgstr "Poruka uneta kada je katanac kreiran." #. (para) #: ../source/TortoiseGit_en.xml:13031 -msgid "If you need to access Subversion revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " +msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " msgstr "Ako treba da pristupite Subverzijinoj reviziojinoj informaciji iz drugih programa, možete koristiti COM interfejs SubWCRev. Objekat koji se kreira je literal>SubWCRev.object, i sledeći metodi su podržani: " #. (programlisting) @@ -11253,8 +11253,8 @@ msgstr "ČPP" #. (para) #: ../source/TortoiseGit_en.xml:13237 -msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and users@TortoiseGit.tigris.org." -msgstr "PoÅ¡to se TortoiseGit razvija sve vreme ponekad je teÅ¡ko da se dokumentacija drži ažurno. Mi održavamo online FAQ koji sadrži izbor pitanja koja su najviÅ¡e postavljana na TortoiseGit mejling listama dev@TortoiseGit.tigris.org i users@TortoiseGit.tigris.org." +msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." +msgstr "PoÅ¡to se TortoiseGit razvija sve vreme ponekad je teÅ¡ko da se dokumentacija drži ažurno. Mi održavamo online FAQ koji sadrži izbor pitanja koja su najviÅ¡e postavljana na TortoiseGit mejling listama tortoisegit-dev@googlegroups.com i tortoisegit-users@googlegroups.com ." #. (para) #: ../source/TortoiseGit_en.xml:13249 @@ -11263,8 +11263,8 @@ msgstr "Takođe podržavamo projekat users@TortoiseGit.tigris.org is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on dev@TortoiseGit.tigris.org." -msgstr "Ako imate pitanje na koje nije odgovoreno bilo gde drugde, najbolje mesto da pitate je jedna od mejling listi. users@TortoiseGit.tigris.org je jedna da služi ako imate pitanja o korišćelju TortoiseGit. Ako želite pomoć u razvoju TortoiseGit, treba da uzmete učešće u diskusiji na dev@TortoiseGit.tigris.org." +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." +msgstr "Ako imate pitanje na koje nije odgovoreno bilo gde drugde, najbolje mesto da pitate je jedna od mejling listi. tortoisegit-users@googlegroups.com je jedna da služi ako imate pitanja o korišćelju TortoiseGit. Ako želite pomoć u razvoju TortoiseGit, treba da uzmete učešće u diskusiji na tortoisegit-dev@googlegroups.com ." #. (title) #: ../source/TortoiseGit_en.xml:13275 @@ -11323,7 +11323,7 @@ msgstr "prazna poruka" #. (para) #: ../source/TortoiseGit_en.xml:13340 -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Subversion clients, but requires access to the server directly." +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." msgstr "Postoji dva načina da se spreče korisnici da urezuju sa praznom dnevnik porukom. Jedan je specifičan za TortoiseGit, drugi radi za sve Subverzione klijente, ali zahteva pristup serveru direktno." #. (title) @@ -11343,7 +11343,7 @@ msgstr "U imeniku spremiÅ¡ta na serveru postoji sub-imenik hooksOK button disabled until the log message is long enough then please use the method described below." +msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." msgstr "Ovaj metod je preporučen način ako vaÅ¡ korisnik takođe koristi druge Subverzione klijente osim TortoiseGit. Neugodnodt je da je urezivanje odbijeno od servera i tada korisnik dobija poruku o greÅ¡ci. Klijent ne može znati pre urezivanja da će biti odbijen. Ako želite da učinite TortoiseGit da ima OK dugme onemogućeno dok dnevnik poruka ne bude dovoljno dugačka koristite metod opisan dole." #. (title) @@ -11490,7 +11490,7 @@ msgstr "PoÅ¡to TortoiseGit nikad ne gubi podatke, vaÅ¡a vraćena nazadsvnadmin. You can find a description of how this works in the Repository Maintenance." +msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." msgstr "Jedini način da se izbace podaci iz spremiÅ¡ta je da se alat Subverzione komandne linije svnadmin. Možete naći opis kako ovo radi u Održavanje spremiÅ¡ta." #. (title) @@ -11555,7 +11555,7 @@ msgstr "Podesite svn:externals karakteristiku za imenik u va #. (para) #: ../source/TortoiseGit_en.xml:13657 -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." msgstr "Urežite novi imenik. Sada kada ažurirate, Subverzija će vući kopiju projekta iz spremiÅ¡ta u vaÅ¡u radnu kopiju. Pod-imenici će biti kreirani automatski ako se zahteva. Svaki put kada ažurirate vaÅ¡u glavnu radnu kopiju, vi ćete takođe dobiti zadnju verziju svih spoljaÅ¡njih projekata." #. (para) @@ -11570,7 +11570,7 @@ msgstr "Koristi ugnježdenu radnu kopiju" #. (para) #: ../source/TortoiseGit_en.xml:13685 -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" +msgid "Create a new folder within your project to contain the common code, but do not add it to Git" msgstr "Kreirajte novi imenik u okviru vaÅ¡eg projekta da sadrži zajedničke kodove, ali ne dodajte to Subverziji." #. (para) @@ -12155,7 +12155,7 @@ msgstr "PoÅ¡to su sve komande TortoiseGit kontrolisane kroz parametre kontrolne #. (para) #: ../source/TortoiseGit_en.xml:14192 -msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." +msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." msgstr "Zapamtite da je TortoiseGit GUI klijent, i ovaj automatizacioni vodič prikazuje kako da učinite da se TortoiseGit dijalog pojavi da sakupi korisnikove ulaze. Ako želite da napiÅ¡ete skript koji ne zahteva ulaz, treba da koristite zvaničan Subverzioni linijski klijent umesto toga." #. (title) @@ -12777,17 +12777,17 @@ msgstr "CLI" #. (para) #: ../source/TortoiseGit_en.xml:14786 -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." +msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." msgstr "Ponekad ovo uputstvo ukazuje na glavne Subverzione dokumente, koji opisuju Subverziju u terminima Interfejsa Komandne Linije (IKL). Da bi vam se pomoglo da razumete Å¡ta TortoiseGit radi iza scene sastavili smo listu koja pokazuje ekvivalentne IKL komande za svaki TortoiseGit GUI." #. (para) #: ../source/TortoiseGit_en.xml:14795 -msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Subversion library directly." +msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." msgstr "Bez obzira Å¡to postoji IKL ekvivalent na ono Å¡to TortoiseGit radi setite se da TortoiseGit ne poziva IKL već koristi Subverzionu biblioteku direktno." #. (para) #: ../source/TortoiseGit_en.xml:14801 -msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Subversion issues. This reference tells you which command to try." +msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." msgstr "Ako mislite da ste naÅ¡li bag u TortoiseGit, možemo vam zatražiti da pokuÅ¡ate da reprodukujete to koristeći IKL, tako da možemo razdvojiti TortoiseGit odziv od Subverzionog odiva. Ove reference vam kažu sa kojim komandama da pokuÅ¡ate. " #. (title) @@ -12851,7 +12851,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14859 -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." msgstr "Ažuriranjem viÅ¡estrukih stavki trenutno nije atomik operacija u Sbverziji. TortoiseGit prvo nađe GLAVNU reviziju spremiÅ¡ta, zatim ažurira sve stavke ka tom posebnom revizionom broju da izbegne radnu kopiju pomeÅ¡anih revizija." #. (para) @@ -12888,7 +12888,7 @@ msgstr "Ako je Samo ažuriraj vrÅ¡ni imenik čekirano, kori #. (para) #: ../source/TortoiseGit_en.xml:14894 -msgid "In TortoiseGit, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." msgstr "U TortoiseGit, dijalog urezivanja koristi viÅ¡e Subverzionih komandi. Prvi period je provera statusa koja određuje stavke u vaÅ¡oj radnoj kopiji koje mogu biti potencijalno urezanje. Možete vratiti listu, diff fajlovi nasuprot OSNOVE i izabrati stavke koje želite da budu uključene u urezivanje." #. (screen) @@ -12909,7 +12909,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14904 #: ../source/TortoiseGit_en.xml:14992 -msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." +msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." msgstr "Ako je Prikaži neverzionisane fajlove čekirano, TortoiseGit će takođe prikazati sve neverzionisane fajlove i imenike u hijerarhiji radne kopije, uzimajući u obzir pravila zanemarivanja. Ova posebna osobina nema direktni ekvivalent u Subverziji, kao Å¡to < literal>svn status komanda ne silazi u neverzionisane imenike." #. (para) @@ -12931,7 +12931,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14919 -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." msgstr "Kada kliknete OK, Subverziono urezivanje počinje. Ako ostavite sve selekcione čekboksove fajlova u njihovom uobičajenom stanju, TortoiseGit koristi jedno rekurzivno urezivanje radne kopije. Ako deselektujete neke fajlove, onda ne-rekurzivno urezivanje (-N) mora da bude uzeto, i svaka putanja mora biti specificirana individualno u komandnoj liniji urezivanja." #. (screen) @@ -13118,7 +13118,7 @@ msgstr "Prvi stepen je provera statusa koja određuje stavke u vaÅ¡oj radnoj kop #. (para) #: ../source/TortoiseGit_en.xml:15072 -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." msgstr "Kada kliknete OK, Subverziono vraćanje se deÅ¡ava. Ako ostavite izbor fajlova čekboks u uobičajenom statusu, TortoiseGit koristi pojedinačno rekurzivno (-R) vraćanje radne kopije. Ako deselektujete neke fajlove, onda svaka putanja mora biti specificirana individualno u komandnoj liniji vraćanja. " #. (screen) @@ -13273,7 +13273,7 @@ msgstr "Ovaj oblik se koristi kada se pristupa iz neverzionisanog imenika, i ime #. (para) #: ../source/TortoiseGit_en.xml:15174 -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." +msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." msgstr "Izvozom radne kopije u različitu lokaciju dato je bez korišćenja Subverzione biblioteke, tako da nema odgovarajućeg ekvivalenta komandne linije." #. (para) @@ -13384,7 +13384,7 @@ msgstr "TortoiseGit kreira fajl zakrpu u ujedinjenom diff formatu poredeći radn #. (para) #: ../source/TortoiseGit_en.xml:15260 -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." msgstr "Primena zakrpa je trik posao sve dok zakrpa i radna kopija su iste revizije. Srećom za vas, možete koristiti TortoiseMerge, koji nema direktni ekvivalent u Subverziji." #. (title) @@ -13404,7 +13404,7 @@ msgstr "prioritet prekrivanja" #. (para) #: ../source/TortoiseGit_en.xml:15289 -msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." +msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." msgstr "Svaki fahl i imenik ima Subverzionu statusnu vrednost kako je objaÅ¡njeno u Subverzionoj biblioteci. U klijentima komandne linije, ovo je pretstavljeno jednim slovom koda, ali TortoiseGit ga prikazuje grafički koristeći prekrivač ikonu. PoÅ¡to je broj prekrivača ograničen, svaki prekrivač može prestavljati jednu od viÅ¡e statusnih vrednosti." #. (para) @@ -13429,12 +13429,12 @@ msgstr "Dodat pr #. (para) #: ../source/TortoiseGit_en.xml:15331 -msgid " The In Subversion overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." -msgstr " U Subverziju prekrivač se koristi da prikaže stavku koja je u normalnoml stanju, ili verzionisana stavka čije stanje nije poznato. PoÅ¡to TortoiseGit koristi pozadinski keÅ¡ing proces ujedini status to može uzeti nekoliko sekundi pre nego se prekrivač ažurira." +msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." +msgstr " U Subverziju prekrivač se koristi da prikaže stavku koja je u normalnoml stanju, ili verzionisana stavka čije stanje nije poznato. PoÅ¡to TortoiseGit koristi pozadinski keÅ¡ing proces ujedini status to može uzeti nekoliko sekundi pre nego se prekrivač ažurira." #. (para) #: ../source/TortoiseGit_en.xml:15340 -msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Subversion 1.4.0 and later, the svn:needs-lock status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." +msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." msgstr " Traži Katanac prekrivač se koristi da označi kada fajl ima svn:needs-lock osobinu podeÅ¡enu. Za radne kopije koje su kreirane korišćenjem Subverzije 1.4.9 i dalje, svn:needs-lock status je keÅ¡iran lokalno pomoću Subverzije i on se koristi da odredi kada da prikaže ovaj prekrivač. Za radne kopije koje su u pre-1.4.h formatu, TortoiseGit prikazuje ovaj prekrivač kada fajl ima samo-čitanje status. Primetimo da Subverzija automatski dograđuje radne kopije kada ih ažurirate, takođe keÅ¡iranje svn:needs-lock osobine se možda neće desiti dok sam fajl nije ažuriran." #. (para) @@ -13454,12 +13454,12 @@ msgstr " Neverzionisa #. (para) #: ../source/TortoiseGit_en.xml:15375 -msgid "If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." +msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "Ako stavka ima subverzioni status nijedan (stavka nije u radnoj kopiji) prekrivač onda neće biti prikazan za te fajlove." #. (para) #: ../source/TortoiseGit_en.xml:15382 -msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." +msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "Stavka može imati samo jednu Subverzionu statusnu vrednost. Na primer fajl može biti lokalno izmenjen i može biti označen za brisanje u isto vreme. Subverzija vraća jediničnu statusnu vrednost - u ovom slučaju obrisan. Ovi prioriteti su definisani samom Subverzijom." #. (para) @@ -13504,23 +13504,23 @@ msgstr "Osiguranje Svnserva koristeći SSH" #. (para) #: ../source/TortoiseGit_en.xml:15452 -msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user." +msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." msgstr "Ovo poglavlje obezbeđuje korak-po-korak vodič za podeÅ¡avanje Subverzije i ToroiseSVN da koriste svn+ssh protokol. Ako već koristite autentifikovanu SSH vezu da se logujete na server, onda ste već tu i možete naći viÅ¡e detalja u Subverzionoj knjizi. Ako ne koristite SSH ali biste želeli da to radite da bi zaÅ¡titili vaÅ¡u instalaciju Subverzije, ovaj vodič vam daje jednostavan metod koji ne obuhvata kreiranje posebnog SSH korisničkog naloga na serveru za svakog Subverzionog korisnika." #. (para) #: ../source/TortoiseGit_en.xml:15462 -msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users." +msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." msgstr "U ovoj primeni kreiramo pojedinačnog SSH korisnika za sve subverzione korisnike, i koristimo različite autentifikacione ključeve da napravimo razliku između pravih Subverzionih korisnika." #. (para) #: ../source/TortoiseGit_en.xml:15467 -msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." +msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "U ovom dodatku uzimamo da već imate subverzioni alat instaliran, i imate kreirano spremiÅ¡te kako je detaljno objaÅ¡njeno negde u ovom uputstvu. Primetimo da ne treba pokrenuti svserv kao servis ili daemon kada ga koristite sa SSH." #. (para) #: ../source/TortoiseGit_en.xml:15473 -msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" -msgstr "Mnogo od informacija ovde dolazi od Mark Logemana, koje se mogu naći na www.logemann.org Dodatne informacije o podeÅ¡avanju Vindouz servera obezbedio je Torston Miler. Hvala ljudi!" +msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" +msgstr "Mnogo od informacija ovde dolazi od Mark Logemana, koje se mogu naći na www.logemann.org Dodatne informacije o podeÅ¡avanju Vindouz servera obezbedio je Torston Miler. Hvala ljudi!" #. (title) #: ../source/TortoiseGit_en.xml:15484 @@ -13540,7 +13540,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15494 -msgid "One point to note is that if you build Subversion from source and do not provide any argument to ./configure, Subversion creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." +msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." msgstr "Da primetimo jedan momenat ako gradite Subverziju od izvornog koda i ne obezbedite neki argument za ./configure, Subverzija kreira bin imenik pod /usr/local i smeÅ¡ta svoje binarno stablo ovde. Ako želite da koristite tunel mod sa SSH, morate voditi računa da korisničko logovanje preko SSH traži da se izvrÅ¡i svnserv program i neki od binarnih. Zbog ovog razloga, ili smestite /usr/local/bin u PATH promenljivu ili kreirajte simboličku vezu vaÅ¡ih binarnih programa sa /usr/sbin imenikom, ili ka nekom drugom imeniku koji je obično u PATH." #. (para) @@ -13702,7 +13702,7 @@ msgstr "Testiranje SSH sa TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:15657 -msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author." +msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "Tako sad imamo samo da testiramo to da se možete logovati koristeći SSH. Sada nam je potreno da osiguramo da SSH veza može stvarno izvrÅ¡avati svnserve. Na serveru izmenite /home/svnuser/.ssh/authorized_keys kako sledi da omogućite da mnogi subverzioni autori koriste isti sistem nalog, svnuser. Primetimo da svaki subverzioni autor koristi isti login ali različit autentifikacioni ključ, tako da imate da dodate jednu liniju za sakog autora." #. (para) @@ -13822,7 +13822,7 @@ msgstr "Pojmovnik" #. (para) #: ../source/TortoiseGit_en.xml:15809 -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "Subverziona komanda se koristi da doda fajl ili imenik u vaÅ¡u radnu kopiju. Nova stavka je dodata u spremiÅ¡te kada urezujete." #. (glossterm) @@ -13857,22 +13857,22 @@ msgstr "Grana" #. (para) #: ../source/TortoiseGit_en.xml:15851 -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a cheap copy." msgstr "Termin često korišćen u kontrolnm sistemu revizija da opiÅ¡e Å¡ta se deÅ¡ava kada se razvoj razdvoji u nekoj tačci i prati 2 odvojene putanje. Možete kreirati granu van glavne razvojne linije tako kao da razvijate nove osobine bez da učinite glavnu liniju nestabilnom. Ili možete granati stabilnu realizaciju za koju ćete samo fiksirati bagove, dok novi razvoj nastavlja na nestabilnom debl. U Subverziji grana se implementira kao jeftina kopija." #. (para) #: ../source/TortoiseGit_en.xml:15866 -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "Subverziona komanda koja kreira lokalnu radnu kopiju u praznom imeniku skidanjem verzionisanih fajlova iz spremiÅ¡ta." #. (para) #: ../source/TortoiseGit_en.xml:15875 -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "Citat iz Subverzione knjige: Rekurzivno čišćenje radne kopije, uklanjanjem katanaca i zavrÅ¡avanjem nezavrÅ¡enih operacija. Ako ikad dobijete radna kopija zaključana greÅ¡ku, izvrÅ¡ite ovu komandu da uklonite ukradene katance i dobijete vaÅ¡u radnu kopiju u korisnom stanju ponovo. Primetimo to da u ovom kontekstu katanac se odnosi na lokalni fajlsistem zaključavanje, ne na zaključavanje spremiÅ¡ta." #. (para) #: ../source/TortoiseGit_en.xml:15892 -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "Subverziona komanda koja se koristi da poÅ¡alje izmene iz vaÅ¡e lokalne radne kopije nazad u spremiÅ¡te, kreiranjem nove revizije spremiÅ¡ta." #. (glossterm) @@ -13882,7 +13882,7 @@ msgstr "Konflikt" #. (para) #: ../source/TortoiseGit_en.xml:15902 -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "Kada se izmene iz spremiÅ¡ta stope sa lokalnim izmenama, ponekad se ove izmene javljaju u istim linijama. U tom slučaju Subverzija ne može automatski odrediti koju verziju da koristi i za fajl se kaže da je u konfliktu. Potrebno je da uredite fajl ručno i razreÅ¡ite konflikt pre nego možete da urežete neke druge izmene." #. (glossterm) @@ -13892,7 +13892,7 @@ msgstr "Kopiraj" #. (para) #: ../source/TortoiseGit_en.xml:15914 -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "U Subverzionom spremiÅ¡tu možete kreirati kopiju pojedinačnog fajla ili celo stablo. Ovo se implementira kao jeftine kopije koje deluju skoro kao veze sa originalom u tome da skoro ne uzimaju prostora. Praveći kopije čuva se istorija stavke u kopiji, tako da možete pratiti urađene izmene pre nego je kopija urađena." #. (para) @@ -13917,7 +13917,7 @@ msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15957 -msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "Fajlsistem u vlasniÅ¡tvu Subverzije u osnovi spremiÅ¡ta. Može se koristiti na mrežnim podelama. Podrazumevan za 1.2 i novija spremiÅ¡ta." #. (para) @@ -13937,7 +13937,7 @@ msgstr "Poslednja revizija fajla ili imenika u spremiÅ¡tu." #. (para) #: ../source/TortoiseGit_en.xml:15982 -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "Subverziona komanda za uvoz cele hijerarhije imenika u spremiÅ¡te u pojedinačnoj reviziji." #. (para) @@ -13982,7 +13982,7 @@ msgstr "Zakrpa" #. (para) #: ../source/TortoiseGit_en.xml:16035 -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "Ako radna kopija ima izmene samo u tekst fajlovima, moguće je koristiti Subverzionu Diff komandu da se generiÅ¡e jedan fajl pregled ovih izmena u Objedinjenom Diff formatu. Fajl ovog tipa se često navodi kao Zakrpa, i može biti poslat elektronskom poÅ¡tom joÅ¡ nekome (ili na mejling listu) i da se primeni u drugoj radnoj kopiji. Neko bez pristupa za urezivanje može napraviti izmene i podneti fajl zakrpu autorizovanom urezivaču da ga primeni. Ili ako niste sigurni o izmenama možete podneti zakrpu drugima da je pregledaju." #. (glossterm) @@ -13992,7 +13992,7 @@ msgstr "Svojstvo" #. (para) #: ../source/TortoiseGit_en.xml:16050 -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "Uz verzionisanje vaÅ¡ih imenika i fajlova, Subverzija dopuÅ¡ta da se dodaju verzionisani metapodaci - na koje se pozivamo kao na osobine svakog od vaÅ¡ih verzionisanih imenika i fajlova. Svaka osobina ima ime i vrednost, slično kao regstarski ključevi. Subverzija ima neke specijalne osobine koje koristi interno, kao Å¡to je svn:eol-style. TortoiseGit ima neke takođe, kao tsvn:logminsize. Možete dodati vaÅ¡e lične osobine sa bilo kojim imenom i vrednošću koju izaberete." #. (para) @@ -14022,7 +14022,7 @@ msgstr "Kada se fajlovi u radnoj kopiji ostave u konfliktnom stanju posle stapan #. (para) #: ../source/TortoiseGit_en.xml:16105 -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "Subverzija čuva lokalnu čistu kopiju svakog fajla kao Å¡to je bio kada ste poslednji put ažurirali vaÅ¡u radnu kopiju. Ako napravite izmene i odlučite da želite da ih poniÅ¡tite, možete koristiti vrati komandu da se vratite na čistu kopiju." #. (glossterm) @@ -14057,12 +14057,12 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:16146 -msgid "A frequently-used abbreviation for Subversion." +msgid "A frequently-used abbreviation for Git." msgstr "Često-koriišćene skraćenice u Subverziji" #. (para) #: ../source/TortoiseGit_en.xml:16149 -msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "Ime Subverzionog običnog protokola koji koristi svnserve server spremiÅ¡ta." #. (para) @@ -14072,7 +14072,7 @@ msgstr "Isto kako Ažuriraj-do-revizije menja vremenski prozor ra #. (para) #: ../source/TortoiseGit_en.xml:16172 -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "Subverziona komanda vuče zadnje promene iz spremiÅ¡ta u radnu kopiju, stapajući sve izmene napravljene od drugih sa lokalnim izenama u radnoj kopiji." #. (glossterm) @@ -14104,7 +14104,7 @@ msgstr "Prevod" #~ msgid "username" #~ msgstr "имекорисника" #~ msgid "" -#~ "Subversion uses the / as the path delimiter in all " +#~ "Git uses the / as the path delimiter in all " #~ "internal pathnames, and all pattern matching is done against this style " #~ "of path names. If you want to use a path delimiter in your ignore " #~ "pattern, be sure to use /, and not the Windows " @@ -14116,7 +14116,7 @@ msgstr "Prevod" #~ "занемаривања будите сигурни да користите /, а не " #~ "Виндоуз обратну косу црту." #~ msgid "" -#~ "Subversion uses this pattern matching against every path presented to it " +#~ "Git uses this pattern matching against every path presented to it " #~ "for action. These paths are generally relative to the directory being " #~ "acted upon for import, add, commit, etc. The matching pattern therefore " #~ "has to take account of the fact that there may or may not be path " @@ -14132,7 +14132,7 @@ msgstr "Prevod" #~ "Fred.c but not subdir/Fred.c. This " #~ "is significant if you add a folder which contains some files that you " #~ "want to be ignored, because those filenames will be preceded with the " -#~ "folder name when Subversion compares them with the ignore pattern." +#~ "folder name when Git compares them with the ignore pattern." #~ msgstr "" #~ "Ако је име именика присутно у путањи алгоритам спаривања неће га скресати " #~ "тако да ће модел Fred.* спарити Fred.c\n" -"Language-Team: TortoiseGit translation team \n" +"Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -94,8 +94,8 @@ msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 -msgid "A Subversion client for Windows" -msgstr "针对 Windows 平台的 Subversion 客户端" +msgid "A Git client for Windows" +msgstr "针对 Windows 平台的 Git 客户端" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) @@ -193,13 +193,13 @@ msgstr "致读者" #. (para) #: ../source/TortoiseGit_en.xml:72 msgid "" -"This book is written for computer literate folk who want to use Subversion to " +"This book is written for computer literate folk who want to use Git to " "manage their data, but are uncomfortable using the command line client to do " "so. Since TortoiseGit is a windows shell extension it's assumed that the user " "is familiar with the windows explorer and knows how to use it." msgstr "" -"本书面向这样的计算机用户: 希望使用 Subversion 管理数据，但又不愿意使用 " -"Subversion 的命令行客户端。因为 TortoiseGit 是 Windows 的外壳扩展应用，所以我" +"本书面向这样的计算机用户: 希望使用 Git 管理数据，但又不愿意使用 " +"Git 的命令行客户端。因为 TortoiseGit 是 Windows 的外壳扩展应用，所以我" "们假设用户很熟悉 Windows 资源管理器的使用。" #. (title) @@ -233,24 +233,24 @@ msgstr "" #, fuzzy msgid "" "In we give a short introduction to the " -"Subversion revision control system which underlies " -"TortoiseGit. This is borrowed from the documentation for the Subversion " +"Git revision control system which underlies " +"TortoiseGit. This is borrowed from the documentation for the Git " "project and explains the different approaches to version control, and how " -"Subversion works." +"Git works." msgstr "" -"在基本概念一章里简短地介绍了 Subversion 版本控制系统，Subversion 是 TortoiseGit 的基础。这一章引用了 " -"Subversion 工程的文档，介绍了各种版本控制模式，以及 Subversion 的工作原理。" +"在基本概念一章里简短地介绍了 Git 版本控制系统，Git 是 TortoiseGit 的基础。这一章引用了 " +"Git 工程的文档，介绍了各种版本控制模式，以及 Git 的工作原理。" #. (para) #: ../source/TortoiseGit_en.xml:102 msgid "" -"Even most Subversion users will never have to set up a server themselves. The " +"Even most Git users will never have to set up a server themselves. The " "next chapter deals with how to set up such a server, and is useful for " "administrators." msgstr "" "在服务器安装一章里介绍了如何安装一个版本控制服务器。虽然" -"大部分的 Subversion 用户从来不需要自己安装服务器，但是对系统管理员来说这一章非" +"大部分的 Git 用户从来不需要自己安装服务器，但是对系统管理员来说这一章非" "常有用。" #. (para) @@ -258,12 +258,12 @@ msgstr "" #, fuzzy msgid "" "The chapter on explains how to set up a " -"local repository, which is useful for testing Subversion and TortoiseGit " +"local repository, which is useful for testing Git and TortoiseGit " "using a single PC. It also explains a bit about repository administration " "which is also relevant to repositories located on a server." msgstr "" "版本库这一章解释了如何设置一个本地版本库，怎样在一台 PC " -"上测试 Subversion 和 TortoiseGit，这一章也介绍了一点版本库管理，也就是如何管理" +"上测试 Git 和 TortoiseGit，这一章也介绍了一点版本库管理，也就是如何管理" "服务器上的版本库。" #. (para) @@ -317,11 +317,11 @@ msgstr "" #, fuzzy msgid "" "The give a correlation between TortoiseGit " -"commands and their equivalents in the Subversion command line client " +"commands and their equivalents in the Git command line client " "svn.exe." msgstr "" "命令行交叉索引给出了 TortoiseGit 命令与其对应的 " -"Subversion 命令行工具 svn.exe 命令之间的关系。" +"Git 命令行工具 svn.exe 命令之间的关系。" #. (title) #: ../source/TortoiseGit_en.xml:144 @@ -364,11 +364,11 @@ msgstr "社区" #. (para) #: ../source/TortoiseGit_en.xml:169 msgid "" -"Both TortoiseGit and Subversion are developed by a community of people who " +"Both TortoiseGit and Git are developed by a community of people who " "are working on those projects. They come from different countries all over " "the world and joined together to create wonderful programs." msgstr "" -"TortoiseGit 和 Subversion 由工作在这些项目的社区成员开发。他们来自全世界不同的" +"TortoiseGit 和 Git 由工作在这些项目的社区成员开发。他们来自全世界不同的" "国家，联合起来创造美妙的程序。" #. (title) @@ -421,15 +421,15 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:216 -msgid "The Subversion Book" -msgstr "Subversion 手册" +msgid "The Git Book" +msgstr "Git 手册" #. (para) #: ../source/TortoiseGit_en.xml:218 msgid "" -"for the great introduction to Subversion and its chapter 2 which we copied " +"for the great introduction to Git and its chapter 2 which we copied " "here" -msgstr "为了对 Subversion 大量介绍，我们复制了其第二章" +msgstr "为了对 Git 大量介绍，我们复制了其第二章" #. (term) #: ../source/TortoiseGit_en.xml:225 @@ -587,21 +587,21 @@ msgstr "什么是 TortoiseGit？" #. (para) #: ../source/TortoiseGit_en.xml:340 msgid "" -"TortoiseGit is a free open-source client for the SubversionGit version control system. That is, TortoiseGit manages files and " "directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that " "it remembers every change ever made to your files and directories. This " "allows you to recover older versions of your files and examine the history of " "how and when your data changed, and who changed it. This is why many people " -"think of Subversion and version control systems in general as a sort of " +"think of Git and version control systems in general as a sort of " "time machine." msgstr "" -"TortoiseGit 是 Subversion 版本控制系统的一个免费开源客" +"TortoiseGit 是 Git 版本控制系统的一个免费开源客" "户端，可以超越时间的管理文件和目录。文件保存在中央版本库，除了能记住文件和目录的每次修改以外，版本库非常像普通的文件服务器。" "你可以将文件恢复到过去的版本，并且可以通过检查历史知道数据做了哪些修改，谁做的" -"修改。这就是为什么许多人将 Subversion 和版本控制系统看作一种时间机器时间机器。" #. (para) @@ -611,13 +611,13 @@ msgid "" "systems. These systems are specifically tailored to manage trees of source " "code, and have many features that are specific to software development - such " "as natively understanding programming languages, or supplying tools for " -"building software. Subversion, however, is not one of these systems; it is a " +"building software. Git, however, is not one of these systems; it is a " "general system that can be used to manage any collection " "of files, including source code." msgstr "" "某些版本控制系统也是软件配置管理(SCM)系统，这种系统经过精巧的设计，专门用来管" "理源代码树，并且具备许多与软件开发有关的特性 - 比如，对编程语言的支持，或者提" -"供程序构建工具。不过 Subversion 并不是这样的系统；它是一个通用系统，可以管理" +"供程序构建工具。不过 Git 并不是这样的系统；它是一个通用系统，可以管理" "任何类型的文件集，包括源代码。" #. (title) @@ -628,13 +628,13 @@ msgstr "TortoiseGit 的历史" #. (para) #: ../source/TortoiseGit_en.xml:369 msgid "" -"In 2002, Tim Kemp found that Subversion was a very good version control " -"system, but it lacked a good GUI client. The idea for a Subversion client as " +"In 2002, Tim Kemp found that Git was a very good version control " +"system, but it lacked a good GUI client. The idea for a Git client as " "a Windows shell integration was inspired by the similar client for CVS named " "TortoiseCVS." msgstr "" -"在2002年，Tim Kemp 发现 Subversion 是一个很好的版本控制系统，但是没有好的图形" -"化客户端，创建一个作为 Windows 外壳集成的 Subversion 客户端的创意来自 " +"在2002年，Tim Kemp 发现 Git 是一个很好的版本控制系统，但是没有好的图形" +"化客户端，创建一个作为 Windows 外壳集成的 Git 客户端的创意来自 " "TortoiseCVS，一个非常类似的 CVS 客户端。" #. (para) @@ -644,28 +644,28 @@ msgid "" "TortoiseGit. He then started the project, registered the domain " "TortoiseGit.org and put the source code online. During " "that time, Stefan Küng was looking for a good and free version control system " -"and found Subversion and the source for TortoiseGit. Since TortoiseGit was " +"and found Git and the source for TortoiseGit. Since TortoiseGit was " "still not ready for use then he joined the project and started programming. " "Soon he rewrote most of the existing code and started adding commands and " "features, up to a point where nothing of the original code remained." msgstr "" "Tim 学习了 TortoiseCVS 的源代码，将其作为 TortoiseGit 的基础，然后开始这个项" "目，注册了域名 TortoiseGit.org，并将源代码提交到网上。此时 " -"Stefan Küng 正在寻找一个好的免费版本控制系统，他发现了 Subversion 和 " +"Stefan Küng 正在寻找一个好的免费版本控制系统，他发现了 Git 和 " "TortoiseGit，由于 TortoiseGit 还不能够使用，他加入了这个项目并开始编程。很快他" "便重写了大多数代码，并且开始添加命令和特性，此时，最初的代码都已经不复存在了。" #. (para) #: ../source/TortoiseGit_en.xml:386 msgid "" -"As Subversion became more stable it attracted more and more users who also " -"started using TortoiseGit as their Subversion client. The user base grew " +"As Git became more stable it attracted more and more users who also " +"started using TortoiseGit as their Git client. The user base grew " "quickly (and is still growing every day). That's when Lübbe Onken offered to " "help out with some nice icons and a logo for TortoiseGit. And he takes care " "of the website and manages the translation." msgstr "" -"随着 Subversion 越来越稳定，吸引了越来越多的用户开始使用 TortoiseGit 作为他们" -"的 Subversion 客户端。用户群增长迅速(每天都持续增长)。Lübbe Onken 提供了许多漂" +"随着 Git 越来越稳定，吸引了越来越多的用户开始使用 TortoiseGit 作为他们" +"的 Git 客户端。用户群增长迅速(每天都持续增长)。Lübbe Onken 提供了许多漂" "亮图标和 TortoiseGit 的 logo，细心照料网站并且管理翻译。" #. (title) @@ -676,10 +676,10 @@ msgstr "TortoiseGit 的特性" #. (para) #: ../source/TortoiseGit_en.xml:400 msgid "" -"What makes TortoiseGit such a good Subversion client? Here's a short list of " +"What makes TortoiseGit such a good Git client? Here's a short list of " "features." msgstr "" -"是什么让 TortoiseGit 成为一个好的 Subversion 客户端？下面是一个简短的特性列" +"是什么让 TortoiseGit 成为一个好的 Git 客户端？下面是一个简短的特性列" "表。" #. (term) @@ -740,26 +740,26 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:445 -msgid "Easy access to Subversion commands" -msgstr "Subversion 命令的简便访问" +msgid "Easy access to Git commands" +msgstr "Git 命令的简便访问" #. (para) #: ../source/TortoiseGit_en.xml:447 msgid "" -"All Subversion commands are available from the explorer context menu. " +"All Git commands are available from the explorer context menu. " "TortoiseGit adds its own submenu there." msgstr "" -"所有的 Subversion 命令存在于资源管理器的右键菜单，TortoiseGit 在那里添加子菜" +"所有的 Git 命令存在于资源管理器的右键菜单，TortoiseGit 在那里添加子菜" "单。" #. (para) #: ../source/TortoiseGit_en.xml:454 msgid "" -"Since TortoiseGit is a Subversion client, we would also like to show you some " -"of the features of Subversion itself:" +"Since TortoiseGit is a Git client, we would also like to show you some " +"of the features of Git itself:" msgstr "" -"因为 TortoiseGit 是一个 Subversion 客户端，我们也很愿意为你展示一些 " -"Subversion 本身的特性: " +"因为 TortoiseGit 是一个 Git 客户端，我们也很愿意为你展示一些 " +"Git 本身的特性: " #. (term) #: ../source/TortoiseGit_en.xml:460 @@ -769,13 +769,13 @@ msgstr "目录版本控制" #. (para) #: ../source/TortoiseGit_en.xml:462 msgid "" -"CVS only tracks the history of individual files, but Subversion implements a " +"CVS only tracks the history of individual files, but Git implements a " "virtual versioned filesystem that tracks changes to whole " "directory trees over time. Files and directories are " "versioned. As a result, there are real client-side move " "and copy commands that operate on files and directories." msgstr "" -"CVS 只能追踪单个文件的历史，但是 Subversion 实现了一个虚拟文件" +"CVS 只能追踪单个文件的历史，但是 Git 实现了一个虚拟文件" "系统，可以追踪整个目录树的修改，文件和目录都是版本控制" "的，结果就是可以在客户端对文件和目录执行移动和复制" "命令。" @@ -816,21 +816,21 @@ msgstr "可选的网络层" #. (para) #: ../source/TortoiseGit_en.xml:499 msgid "" -"Subversion has an abstracted notion of repository access, making it easy for " -"people to implement new network mechanisms. Subversion's advancedadvanced network server is a module for the Apache web server, which speaks a " -"variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage " +"variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage " "in stability and interoperability, and provides various key features for " "free: authentication, authorization, wire compression, and repository " -"browsing, for example. A smaller, standalone Subversion server process is " +"browsing, for example. A smaller, standalone Git server process is " "also available. This server speaks a custom protocol which can be easily " "tunneled over ssh." msgstr "" -"Subversion 在版本库访问方面有一个抽象概念，利于人们去实现新的网络机制，" -"Subversion 的高级服务器是 Apache 网络服务器的一个模块，使用 " -"HTTP 的变种协议 WebDAV/DeltaV 通讯，这给了 Subversion 在稳定性和交互性方面很大" +"Git 在版本库访问方面有一个抽象概念，利于人们去实现新的网络机制，" +"Git 的高级服务器是 Apache 网络服务器的一个模块，使用 " +"HTTP 的变种协议 WebDAV/DeltaV 通讯，这给了 Git 在稳定性和交互性方面很大" "的好处，可以直接使用服务器的特性，例如认证、授权、传输压缩和版本库浏览等等。也" -"有一个轻型的，单独运行的 Subversion 服务器，这个服务器使用自己的协议，可以轻松" +"有一个轻型的，单独运行的 Git 服务器，这个服务器使用自己的协议，可以轻松" "的用 SSH 封装。" #. (term) @@ -841,13 +841,13 @@ msgstr "一致的数据处理" #. (para) #: ../source/TortoiseGit_en.xml:518 msgid "" -"Subversion expresses file differences using a binary differencing algorithm, " +"Git expresses file differences using a binary differencing algorithm, " "which works identically on both text (human-readable) and binary (human-" "unreadable) files. Both types of files are stored equally compressed in the " "repository, and differences are transmitted in both directions across the " "network." msgstr "" -"Subversion 使用二进制文件差异算法展现文件的区别，对于文本(人类可读)和二进制(人" +"Git 使用二进制文件差异算法展现文件的区别，对于文本(人类可读)和二进制(人" "类不可读)文件具备一致的操作方式，两种类型的文件都压缩存放在版本库中，差异在网" "络上双向传递。" @@ -860,11 +860,11 @@ msgstr "高效的分支和标签" #: ../source/TortoiseGit_en.xml:531 msgid "" "The cost of branching and tagging need not be proportional to the project " -"size. Subversion creates branches and tags by simply copying the project, " +"size. Git creates branches and tags by simply copying the project, " "using a mechanism similar to a hard-link. Thus these operations take only a " "very small, constant amount of time, and very little space in the repository." msgstr "" -"分支与标签的代价不与工程的大小成比例，Subversion 建立分支与标签时只是复制项" +"分支与标签的代价不与工程的大小成比例，Git 建立分支与标签时只是复制项" "目，使用了一种类似于硬链接的机制，因而这类操作通常只会花费很少并且相对固定的时" "间，以及很小的版本库空间。" @@ -876,12 +876,12 @@ msgstr "良好的维护能力" #. (para) #: ../source/TortoiseGit_en.xml:544 msgid "" -"Subversion has no historical baggage; it is implemented as a collection of " -"shared C libraries with well-defined APIs. This makes Subversion extremely " +"Git has no historical baggage; it is implemented as a collection of " +"shared C libraries with well-defined APIs. This makes Git extremely " "maintainable and usable by other applications and languages." msgstr "" -"Subversion 没有历史负担，它由一系列良好的共享 C 库实现，具有定义良好的 API，这" -"使 Subversion 非常容易维护，可以轻易的被其他语言和程序使用。" +"Git 没有历史负担，它由一系列良好的共享 C 库实现，具有定义良好的 API，这" +"使 Git 非常容易维护，可以轻易的被其他语言和程序使用。" #. (title) #: ../source/TortoiseGit_en.xml:558 @@ -1116,42 +1116,42 @@ msgstr "基本概念" #. (primary) #: ../source/TortoiseGit_en.xml:724 -msgid "Subversion book" -msgstr "Subversion 手册" +msgid "Git book" +msgstr "Git 手册" #. (para) #: ../source/TortoiseGit_en.xml:727 msgid "" "This chapter is a slightly modified version of the same chapter in the " -"Subversion book. An online version of the Subversion book is available here: " +"Git book. An online version of the Git book is available here: " "http://svnbook.red-" "bean.com/." msgstr "" -"本章修改自《使用 Subversion 进行版本管理》的相同章节，它的在线版本位于: " +"本章修改自《使用 Git 进行版本管理》的相同章节，它的在线版本位于: " "http://svnbook.red-" "bean.com/。" #. (para) #: ../source/TortoiseGit_en.xml:735 msgid "" -"This chapter is a short, casual introduction to Subversion. If you're new to " +"This chapter is a short, casual introduction to Git. If you're new to " "version control, this chapter is definitely for you. We begin with a " "discussion of general version control concepts, work our way into the " -"specific ideas behind Subversion, and show some simple examples of Subversion " +"specific ideas behind Git, and show some simple examples of Git " "in use." msgstr "" -"这一章是对 Subversion 一个简短随意的介绍，如果你对版本控制很陌生，这一章节完全" -"是为你准备的，我们从讨论基本概念开始，深入理解 Subversion 的思想，然后展示许多" +"这一章是对 Git 一个简短随意的介绍，如果你对版本控制很陌生，这一章节完全" +"是为你准备的，我们从讨论基本概念开始，深入理解 Git 的思想，然后展示许多" "简单的实例。" #. (para) #: ../source/TortoiseGit_en.xml:743 msgid "" "Even though the examples in this chapter show people sharing collections of " -"program source code, keep in mind that Subversion can manage any sort of file " +"program source code, keep in mind that Git can manage any sort of file " "collection - it's not limited to helping computer programmers." msgstr "" -"尽管我们的例子展示了人们如何分享程序源代码，仍然要记住 Subversion 可以控制所有" +"尽管我们的例子展示了人们如何分享程序源代码，仍然要记住 Git 可以控制所有" "类型的文件－它并没有限制只为程序员工作。" #. (title) @@ -1171,7 +1171,7 @@ msgstr "版本库" #. (para) #: ../source/TortoiseGit_en.xml:755 msgid "" -"Subversion is a centralized system for sharing information. At its core is a " +"Git is a centralized system for sharing information. At its core is a " "repository, which is a central store of data. The " "repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of " @@ -1180,7 +1180,7 @@ msgid "" "available to others; by reading data, the client receives information from " "others." msgstr "" -"Subversion 是一种集中的分享信息的系统，它的核心是版本库版本库，储存所有的数据，版本库按照文件树形式储存数" "据－包括文件和目录，任意数量的客户端可以连接到版本库，" "读写这些文件。通过写数据，别人可以看到这些信息；通过读数据，可以看到别人的修" @@ -1196,7 +1196,7 @@ msgstr "一个典型的客户/服务器系统" msgid "" "So why is this interesting? So far, this sounds like the definition of a " "typical file server. And indeed, the repository is a " -"kind of file server, but it's not your usual breed. What makes the Subversion " +"kind of file server, but it's not your usual breed. What makes the Git " "repository special is that it remembers every change " "ever written to it: every change to every file, and even changes to the " "directory tree itself, such as the addition, deletion, and rearrangement of " @@ -1204,7 +1204,7 @@ msgid "" msgstr "" "所以为什么这很有趣呢？讲了这么多，让人感觉这是一种普通的文件服务器，但实际上，" "版本库是另一种文件服务器，而不是你常见的那一种。最特别的" -"是 Subversion 会记录每一次的更改，不仅针对文件也包括目录" +"是 Git 会记录每一次的更改，不仅针对文件也包括目录" "本身，包括增加、删除和重新组织文件和目录。" #. (para) @@ -1363,7 +1363,7 @@ msgstr "复制-修改-合并 方案" #. (para) #: ../source/TortoiseGit_en.xml:895 msgid "" -"Subversion, CVS, and other version control systems use a copy-" +"Git, CVS, and other version control systems use a copy-" "modify-merge model as an alternative to locking. In this model, " "each user's client reads the repository and creates a personal " "working copy of the file or project. Users then work " @@ -1372,7 +1372,7 @@ msgid "" "assists with the merging, but ultimately a human being is responsible for " "making it happen correctly." msgstr "" -"Subversion，CVS 和一些版本控制系统使用复制-修改-合并模" +"Git，CVS 和一些版本控制系统使用复制-修改-合并模" "型，在这种模型里，每一个客户读取项目版本库建立一个私有工作副本—版本库中文件和目录的本地映射。用户并行工作，修改各自的工作副" "本，最终，各个私有的复制合并在一起，成为最终的版本，这种系统通常可以辅助合并操" @@ -1478,26 +1478,26 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:976 -msgid "What does Subversion Do?" -msgstr "Subversion 怎么做？" +msgid "What does Git Do?" +msgstr "Git 怎么做？" #. (para) #: ../source/TortoiseGit_en.xml:977 msgid "" -"Subversion uses the copy-modify-merge solution by default, and in many cases " -"this is all you will ever need. However, as of Version 1.2, Subversion also " +"Git uses the copy-modify-merge solution by default, and in many cases " +"this is all you will ever need. However, as of Version 1.2, Git also " "supports file locking, so if you have unmergeable files, or if you are simply " -"forced into a locking policy by management, Subversion will still provide the " +"forced into a locking policy by management, Git will still provide the " "features you need." msgstr "" -"Subversion 缺省使用复制-修改-合并模型，大多数情况下可以满足你的需求。然而，" -"Subversion 1.2 后还是支持锁定，如果你有不可合并的文件，或者你只是想实行强制管" -"理策略，Subversion 仍然会提供你需要的特性。" +"Git 缺省使用复制-修改-合并模型，大多数情况下可以满足你的需求。然而，" +"Git 1.2 后还是支持锁定，如果你有不可合并的文件，或者你只是想实行强制管" +"理策略，Git 仍然会提供你需要的特性。" #. (title) #: ../source/TortoiseGit_en.xml:989 -msgid "Subversion in Action" -msgstr "Subversion 实战" +msgid "Git in Action" +msgstr "Git 实战" #. (title) #: ../source/TortoiseGit_en.xml:991 @@ -1513,23 +1513,23 @@ msgstr "工作副本" #: ../source/TortoiseGit_en.xml:995 msgid "" "You've already read about working copies; now we'll demonstrate how the " -"Subversion client creates and uses them." +"Git client creates and uses them." msgstr "" "你已经阅读过了关于工作副本的内容，现在我们要讲一讲客户端怎样建立和使用它。" #. (para) #: ../source/TortoiseGit_en.xml:1000 msgid "" -"A Subversion working copy is an ordinary directory tree on your local system, " +"A Git working copy is an ordinary directory tree on your local system, " "containing a collection of files. You can edit these files however you wish, " "and if they're source code files, you can compile your program from them in " -"the usual way. Your working copy is your own private work area: Subversion " +"the usual way. Your working copy is your own private work area: Git " "will never incorporate other people's changes, nor make your own changes " "available to others, until you explicitly tell it to do so." msgstr "" -"一个 Subversion 工作副本是你本地机器一个普通的目录，保存着一些文件，你可以任意" +"一个 Git 工作副本是你本地机器一个普通的目录，保存着一些文件，你可以任意" "的编辑文件，而且如果是源代码文件，你可以像平常一样编译，你的工作副本是你的私有" -"工作区，在你明确的做了特定操作之前，Subversion 不会把你的修改与其他人的合并，" +"工作区，在你明确的做了特定操作之前，Git 不会把你的修改与其他人的合并，" "也不会把你的修改展示给别人。" #. (para) @@ -1537,42 +1537,42 @@ msgstr "" #, fuzzy msgid "" "After you've made some changes to the files in your working copy and verified " -"that they work properly, Subversion provides you with commands to " +"that they work properly, Git provides you with commands to " "publish your changes to the other people working with " "you on your project (by writing to the repository). If other people publish " -"their own changes, Subversion provides you with commands to merge those " +"their own changes, Git provides you with commands to merge those " "changes into your working directory (by reading from the repository)." msgstr "" -"当你在工作副本作了一些修改并且确认它们工作正常之后，Subversion 提供了一个命令" +"当你在工作副本作了一些修改并且确认它们工作正常之后，Git 提供了一个命令" "可以“发布”你的修改给项目中的其他人(通过写到版本库)，如果别人发布了各自的修改，" -"Subversion 提供了手段可以把这些修改与你的工作目录进行合并(通过读取版本库)。" +"Git 提供了手段可以把这些修改与你的工作目录进行合并(通过读取版本库)。" #. (para) #: ../source/TortoiseGit_en.xml:1020 msgid "" "A working copy also contains some extra files, created and maintained by " -"Subversion, to help it carry out these commands. In particular, each " +"Git, to help it carry out these commands. In particular, each " "directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative " "directory. The files in each administrative directory help " -"Subversion recognize which files contain unpublished changes, and which files " +"Git recognize which files contain unpublished changes, and which files " "are out-of-date with respect to others' work." msgstr "" -"一个工作副本也包括一些由 Subversion 创建并维护的额外文件，用来协助执行这些命" +"一个工作副本也包括一些由 Git 创建并维护的额外文件，用来协助执行这些命" "令。通常情况下，你的工作副本每一个文件夹有一个以 .svn 为" "名的文件夹，也被叫做工作副本管理目录，这个目录里的文件" -"能够帮助 Subversion 识别哪一个文件做过修改，哪一个文件相对于别人的工作已经过期" +"能够帮助 Git 识别哪一个文件做过修改，哪一个文件相对于别人的工作已经过期" "了。" #. (para) #: ../source/TortoiseGit_en.xml:1031 msgid "" -"A typical Subversion repository often holds the files (or source code) for " +"A typical Git repository often holds the files (or source code) for " "several projects; usually, each project is a subdirectory in the repository's " "filesystem tree. In this arrangement, a user's working copy will usually " "correspond to a particular subtree of the repository." msgstr "" -"一个典型的 Subversion 的版本库经常包含许多项目的文件(或者说源代码)，通常每一个" +"一个典型的 Git 的版本库经常包含许多项目的文件(或者说源代码)，通常每一个" "项目都是版本库的子目录，在这种安排下，一个用户的工作副本往往对应版本库的的一个" "子目录。" @@ -1615,23 +1615,23 @@ msgstr "" msgid "" "Suppose you make changes to button.c. Since the " ".svn directory remembers the file's modification date " -"and original contents, Subversion can tell that you've changed the file. " -"However, Subversion does not make your changes public until you explicitly " +"and original contents, Git can tell that you've changed the file. " +"However, Git does not make your changes public until you explicitly " "tell it to. The act of publishing your changes is more commonly known as " "committing (or checking in) " "changes to the repository." msgstr "" "假定你修改了 button.c，因为 .svn 目" -"录记录着文件的修改日期和原始内容，Subversion 可以告诉你已经修改了文件，然而，" -"在你明确告诉它之前，Subversion 不会将你的改变公开。将改变公开的操作被叫做提交" +"录记录着文件的修改日期和原始内容，Git 可以告诉你已经修改了文件，然而，" +"在你明确告诉它之前，Git 不会将你的改变公开。将改变公开的操作被叫做提交" "(或者是检入)，它提交修改到版本库中。" #. (para) #: ../source/TortoiseGit_en.xml:1068 msgid "" -"To publish your changes to others, you can use Subversion's commitcommit command." -msgstr "发布你的修改给别人，可以使用 Subversion 的提交命令。" +msgstr "发布你的修改给别人，可以使用 Git 的提交命令。" #. (para) #: ../source/TortoiseGit_en.xml:1072 @@ -1649,34 +1649,34 @@ msgid "" "Suppose you have a collaborator, Sally, who checked out a working copy of " "/calc at the same time you did. When you commit your " "change to button.c, Sally's working copy is left " -"unchanged; Subversion only modifies working copies at the user's request." +"unchanged; Git only modifies working copies at the user's request." msgstr "" "设你有个合作者，Sally，她和你同时取出了 /calc 的一个工作" "副本，你提交了你对 button.c 的修改，Sally 的工作副本并没" -"有改变，Subversion 只在用户要求的时候才改变工作副本。" +"有改变，Git 只在用户要求的时候才改变工作副本。" #. (para) #: ../source/TortoiseGit_en.xml:1086 msgid "" -"To bring her project up to date, Sally can ask Subversion to " -"update her working copy, by using the Subversion " +"To bring her project up to date, Sally can ask Git to " +"update her working copy, by using the Git " "update command. This will incorporate your changes into " "her working copy, as well as any others that have been committed since she " "checked it out." msgstr "" -"要使项目最新，Sally 可以要求 Subversion 更新她的工作副" +"要使项目最新，Sally 可以要求 Git 更新她的工作副" "本，通过使用更新命令，可以将你和所有其他人在她上次更新之后的修改合并到她的工作" "副本。" #. (para) #: ../source/TortoiseGit_en.xml:1094 msgid "" -"Note that Sally didn't need to specify which files to update; Subversion uses " +"Note that Sally didn't need to specify which files to update; Git uses " "the information in the .svn directory, and further " "information in the repository, to decide which files need to be brought up to " "date." msgstr "" -"注意，Sally 不必指定要更新的文件，Subversion 利用 .svn 以" +"注意，Sally 不必指定要更新的文件，Git 利用 .svn 以" "及版本库的进一步信息决定哪些文件需要更新。" #. (title) @@ -1687,11 +1687,11 @@ msgstr "版本库的 URL" #. (para) #: ../source/TortoiseGit_en.xml:1104 msgid "" -"Subversion repositories can be accessed through many different methods - on " +"Git repositories can be accessed through many different methods - on " "local disk, or through various network protocols. A repository location, " "however, is always a URL. The URL schema indicates the access method:" msgstr "" -"Subversion 可以通过多种方式访问－本地磁盘访问，或各种各样不同的网络协议，但一" +"Git 可以通过多种方式访问－本地磁盘访问，或各种各样不同的网络协议，但一" "个版本库地址永远都是一个 URL，URL 方案反映了访问方法。" #. (title) @@ -1727,8 +1727,8 @@ msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "通过 WebDAV 协议访问支持 Subversion 的 Apache 服务器。" +msgid "Access via WebDAV protocol to Git-aware Apache server." +msgstr "通过 WebDAV 协议访问支持 Git 的 Apache 服务器。" #. (literal) #: ../source/TortoiseGit_en.xml:1141 @@ -1777,7 +1777,7 @@ msgstr "通过认证并加密的 TCP/IP 自定义协议访问 #: ../source/TortoiseGit_en.xml:1168 #, fuzzy msgid "" -"For the most part, Subversion's URLs use the standard syntax, allowing for " +"For the most part, Git's URLs use the standard syntax, allowing for " "server names and port numbers to be specified as part of the URL. The " "file:// access method is normally used for local access, " "although it can be used with UNC paths to a networked host. The URL therefore " @@ -1787,7 +1787,7 @@ msgid "" "For this reason, local paths normally appear with three slashes, file:///path/to/repos." msgstr "" -"大多数情况下，Subversion 的 URL 使用标准语法，允许服务器名称和端口号作为 URL " +"大多数情况下，Git 的 URL 使用标准语法，允许服务器名称和端口号作为 URL " "的一部分。file:访问方法通常用来本地访问，尽管也可以使用 " "UNC 路径访问网络主机，采用的 URL 形式为 file://hostname/path/to/" "repos。对于本地主机，主机部分可以为空或者是localhostentire trees, not individual files. " "Each revision number selects an entire tree, a particular state of the " "repository after some committed change. Another way to think about it is that " "revision N represents the state of the repository filesystem after the Nth " -"commit. When a Subversion user talks about ``revision 5 of foo.cfoo.c'', they really mean ``foo.c as it appears in " "revision 5.'' Notice that in general, revisions N and M of a file do " "not necessarily differ!" msgstr "" -"不像其它版本控制系统，Subversion 的版本号是针对整个目录树" +"不像其它版本控制系统，Git 的版本号是针对整个目录树" "的，而不是单个文件。每一个版本号代表了一次提交后版本库整个目录树的特定状态，另" -"一种理解是版本 N 代表版本库已经经过了 N 次提交。当 Subversion 用户讨" +"一种理解是版本 N 代表版本库已经经过了 N 次提交。当 Git 用户讨" "论“foo.c的版本 5”时，他们的实际意思是“在版本 5 时的" "foo.c”。需要注意的是，一个文件的版本 N 和 M 并" "不表示它必定不同。" @@ -2022,14 +2022,14 @@ msgid "" "Sally's changes to integer.c will appear in your working " "copy, and your change will still be present in button.c. " "In this example, the text of Makefile is identical in " -"revisions 4, 5, and 6, but Subversion will mark your working copy of " +"revisions 4, 5, and 6, but Git will mark your working copy of " "Makefile with revision 6 to indicate that it is still " "current. So, after you do a clean update at the top of your working copy, it " "will generally correspond to exactly one revision in the repository." msgstr "" "Sally 对 integer.c 的改变会出现在你的工作副本，你对 " "button.c 的改变还在，在这个例子里，Makefile 在 4、5、6 版本都是一样的，但是 Subversion 会把 " +"filename> 在 4、5、6 版本都是一样的，但是 Git 会把 " "Makefile 的版本设为 6 来表明它是最新的，所以你在工作副本" "顶级目录作一次干净的更新，会使所有内容对应版本库的同一修订版本。" @@ -2041,10 +2041,10 @@ msgstr "工作副本怎样跟踪版本库" #. (para) #: ../source/TortoiseGit_en.xml:1326 msgid "" -"For each file in a working directory, Subversion records two essential pieces " +"For each file in a working directory, Git records two essential pieces " "of information in the .svn/ administrative area:" msgstr "" -"对于工作副本的每一个文件，Subversion 在管理目录 .svn/ è®°" +"对于工作副本的每一个文件，Git 在管理目录 .svn/ è®°" "录两项关键的信息: " #. (para) @@ -2063,10 +2063,10 @@ msgstr "一个本地副本最后更新的时间戳。" #. (para) #: ../source/TortoiseGit_en.xml:1345 msgid "" -"Given this information, by talking to the repository, Subversion can tell " +"Given this information, by talking to the repository, Git can tell " "which of the following four states a working file is in:" msgstr "" -"给定这些信息，通过与版本库通讯，Subversion 可以告诉我们工作文件是处与如下四种" +"给定这些信息，通过与版本库通讯，Git 可以告诉我们工作文件是处与如下四种" "状态的那一种: " #. (term) @@ -2135,12 +2135,12 @@ msgid "" "repository. A commit of the file will fail with an " "out-of-date error. The file should be updated first; an " "update command will attempt to merge the public changes " -"with the local changes. If Subversion can't complete the merge in a plausible " +"with the local changes. If Git can't complete the merge in a plausible " "way automatically, it leaves it to the user to resolve the conflict." msgstr "" "这个文件在工作副本和版本库都被修改。commit 将会失败，这个文" "件必须首先更新，update 命令会尝试合并公共和本地修改，如果 " -"Subversion 不能自动完成，将会让用户解决冲突。" +"Git 不能自动完成，将会让用户解决冲突。" #. (title) #: ../source/TortoiseGit_en.xml:1412 @@ -2150,8 +2150,8 @@ msgstr "摘要" #. (para) #: ../source/TortoiseGit_en.xml:1413 msgid "" -"We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "我们在这一章里学习了许多 Subversion 基本概念: " +"We've covered a number of fundamental Git concepts in this chapter:" +msgstr "我们在这一章里学习了许多 Git 基本概念: " #. (para) #: ../source/TortoiseGit_en.xml:1419 @@ -2163,19 +2163,19 @@ msgstr "我们介绍了中央版本库、客户工作副本和版本库中版本 #. (para) #: ../source/TortoiseGit_en.xml:1425 msgid "" -"We've seen some simple examples of how two collaborators can use Subversion " +"We've seen some simple examples of how two collaborators can use Git " "to publish and receive changes from one another, using the 'copy-modify-" "merge' model." msgstr "" "我们介绍了两个协作者如何使用使用复制-修改-合并模型，用 " -"Subversion 发布和获得对方的修改。" +"Git 发布和获得对方的修改。" #. (para) #: ../source/TortoiseGit_en.xml:1432 msgid "" -"We've talked a bit about the way Subversion tracks and manages information in " +"We've talked a bit about the way Git tracks and manages information in " "a working copy." -msgstr "我们讨论了一些 Subversion 跟踪和管理工作副本信息的方式。" +msgstr "我们讨论了一些 Git 跟踪和管理工作副本信息的方式。" #. (title) #: ../source/TortoiseGit_en.xml:1445 @@ -2186,7 +2186,7 @@ msgstr "配置服务器" #: ../source/TortoiseGit_en.xml:1447 #, fuzzy msgid "" -"To use TortoiseGit (or any other Subversion client), you need a place where " +"To use TortoiseGit (or any other Git client), you need a place where " "your repositories are located. You can either store your repositories locally " "and access them using the file:// protocol or you can " "place them on a server and access them with the http:// or " @@ -2195,7 +2195,7 @@ msgid "" "literal>. This chapter shows you step by step on how you can set up such a " "server on a Windows machine." msgstr "" -"为了使用TortoiseGit(或任何其他Subversion客户端)，你需要放置你的版本库，你可以" +"为了使用TortoiseGit(或任何其他Git客户端)，你需要放置你的版本库，你可以" "将版本库存于本地并使用file://协议访问，也可以放置于服务" "器，使用http://或svn://访问，这两种" "服务器协议也可以被加密，使用https://或svn" @@ -2205,13 +2205,13 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1458 #, fuzzy msgid "" -"More detailed information on the Subversion server options, and how to choose " -"the best architecture for your situation, can be found in the Subversion book " +"More detailed information on the Git server options, and how to choose " +"the best architecture for your situation, can be found in the Git book " "under Server Configuration." msgstr "" -"关于 Subversion 服务器选项的详细信息，以及如何根据你的情况选择最好的架构，可以" -"参考 Subversion 手册的服务器配置。" #. (para) @@ -2246,7 +2246,7 @@ msgstr "Apache" #. (para) #: ../source/TortoiseGit_en.xml:1486 msgid "" -"The most flexible of all possible server setups for Subversion is the Apache " +"The most flexible of all possible server setups for Git is the Apache " "based one. Although a bit more complicated to set up, it offers benefits that " "other servers cannot:" msgstr "" @@ -2263,12 +2263,12 @@ msgstr "WebDAV" #: ../source/TortoiseGit_en.xml:1498 #, fuzzy msgid "" -"The Apache based Subversion server uses the WebDAV protocol which is " +"The Apache based Git server uses the WebDAV protocol which is " "supported by many other programs as well. You could e.g. mount such a " "repository as a Web folder in the Windows explorer and then " "access it like any other folder in the file system." msgstr "" -"基于 Apache 的 Subversion 服务器使用 WebDAV 协议，许多程序支持这个协议。例如你" +"基于 Apache 的 Git 服务器使用 WebDAV 协议，许多程序支持这个协议。例如你" "可以在 Windows 资源管理器中将这样的版本库装载为一个“网络文件夹”，就像访问文件" "系统的目录一样访问它。" @@ -2281,10 +2281,10 @@ msgstr "浏览版本库" #: ../source/TortoiseGit_en.xml:1511 msgid "" "You can point your browser to the URL of your repository and browse the " -"contents of it without having a Subversion client installed. This gives " +"contents of it without having a Git client installed. This gives " "access to your data to a much wider circle of users." msgstr "" -"你可以将浏览器指向版本库的URL，无需安装Subversion客户端就可以浏览内容，这样可" +"你可以将浏览器指向版本库的URL，无需安装Git客户端就可以浏览内容，这样可" "以扩大访问你数据的用户圈。" #. (term) @@ -2436,33 +2436,33 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:1628 -msgid "Installing Subversion" -msgstr "安装 Subversion" +msgid "Installing Git" +msgstr "安装 Git" #. (para) #: ../source/TortoiseGit_en.xml:1632 #, fuzzy msgid "" -"Download the latest version of the Subversion Win32 binaries for Apache. Be " +"Download the latest version of the Git Win32 binaries for Apache. Be " "sure to get the right version to integrate with your version of Apache, " "otherwise you will get an obscure error message when you try to restart. If " -"you have Apache 2.2.x go to http://subversion." +"you have Apache 2.2.x go to http://Git." "tigris.org/servlets/ProjectDocumentList?folderID=8100." msgstr "" -"从http://subversion.tigris.org/servlets/" -"ProjectDocumentList?folderID=91得到最新版本的Subversion。" +"从http://Git.tigris.org/servlets/" +"ProjectDocumentList?folderID=91得到最新版本的Git。" #. (para) #: ../source/TortoiseGit_en.xml:1644 msgid "" -"Run the Subversion installer and follow the instructions. If the Subversion " +"Run the Git installer and follow the instructions. If the Git " "installer recognized that you've installed Apache, then you're almost done. " "If it couldn't find an Apache server then you have to do some additional " "steps." msgstr "" -"运行Subversion安装程序，并根据指导安装，如果Subversion认识到你安装了Apache，你" +"运行Git安装程序，并根据指导安装，如果Git认识到你安装了Apache，你" "就几乎完成了工作，如果它没有找到Apache服务器，你还有额外的步骤。" #. (primary) @@ -2474,14 +2474,14 @@ msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 msgid "" -"Using the windows explorer, go to the installation directory of Subversion " -"(usually c:\\program files\\Subversion) and find the " +"Using the windows explorer, go to the installation directory of Git " +"(usually c:\\program files\\Git) and find the " "files /httpd/mod_dav_svn.so and mod_authz_svn." "so. Copy these files to the Apache modules directory (usually " "c:\\program files\\apache group\\apache2\\modules )." msgstr "" -"使用Windwos资源管理器，来到Subversion的安装目录(通常是c:\\program " -"files\\Subversion)，找到文件/httpd/mod_dav_svn.soc:\\program " +"files\\Git)，找到文件/httpd/mod_dav_svn.so和mod_authz_svn.so，复制这些文件到Apache的模块目" "录(通常是c:\\program files\\apache group\\apache2\\modules )。" @@ -2490,10 +2490,10 @@ msgstr "" #: ../source/TortoiseGit_en.xml:1669 msgid "" "Copy the file /bin/libdb*.dll and /bin/" -"intl3_svn.dll from the Subversion installation directory to the " +"intl3_svn.dll from the Git installation directory to the " "Apache bin directory." msgstr "" -"从 Subversion 安装目录将 /bin/libdb*.dll 和 /" +"从 Git 安装目录将 /bin/libdb*.dll 和 /" "bin/intl3_svn.dll 复制到 Apache 的 bin 目录。" #. (para) @@ -2536,15 +2536,15 @@ msgstr "配置" #. (para) #: ../source/TortoiseGit_en.xml:1703 msgid "" -"Now you have set up Apache and Subversion, but Apache doesn't know how to " -"handle Subversion clients like TortoiseGit yet. To get Apache to know which " -"URL will be used for Subversion repositories you have to edit the Apache " +"Now you have set up Apache and Git, but Apache doesn't know how to " +"handle Git clients like TortoiseGit yet. To get Apache to know which " +"URL will be used for Git repositories you have to edit the Apache " "configuration file (usually located in c:\\program files\\apache " "group\\apache2\\conf\\httpd.conf) with any text editor you like (e." "g. Notepad): " msgstr "" -"现在你已经配置了 Apache 和 Subversion，但是 Apache 不知道如何处理 Subversion " -"客户端，例如TortoiseGit。为了让 Apache 知道哪个 URL 是用作 Subversion 版本库，" +"现在你已经配置了 Apache 和 Git，但是 Apache 不知道如何处理 Git " +"客户端，例如TortoiseGit。为了让 Apache 知道哪个 URL 是用作 Git 版本库，" "你需要使用任意文本编辑器(例如记事本)编辑 Apache 的配置文件(通常是 c:" "\\program files\\apache group\\apache2\\conf\\httpd.conf): " "" @@ -2560,12 +2560,12 @@ msgid "" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" -" This configures Apache so that all your Subversion repositories are " +" This configures Apache so that all your Git repositories are " "physically located below D:\\SVN. The repositories are " "served to the outside world from the URL: http://" "MyServer/svn/ . Access is restricted to known users/passwords " @@ -2578,12 +2578,12 @@ msgstr "" "SVNParentPath D:\\SVN\n" "#SVNIndexXSLT \"/svnindex.xsl\"\n" "AuthType Basic\n" -"AuthName \"Subversion repositories\"\n" +"AuthName \"Git repositories\"\n" "AuthUserFile passwd\n" "#AuthzSVNAccessFile svnaccessfile\n" "Require valid-user\n" "</Location>\n" -"这个配置告诉 Apache 你所有的 Subversion 版本库位于 D:" +"这个配置告诉 Apache 你所有的 Git 版本库位于 D:" "\\SVN。这些版本库对外的 URL 是: http://" "MyServer/svn/。访问被文件 passwd 中的用户/密" "码限制。" @@ -2621,7 +2621,7 @@ msgstr "再次重启Apache服务。" msgid "" "Point your browser to http://MyServer/svn/" "MyNewRepository (where MyNewRepository is " -"the name of the Subversion repository you created before). If all went well " +"the name of the Git repository you created before). If all went well " "you should be prompted for a username and password, then you can see the " "contents of your repository." msgstr "" @@ -2670,9 +2670,9 @@ msgstr "解释" #. (entry) #: ../source/TortoiseGit_en.xml:1798 msgid "" -"means that the Subversion repositories are available from the URL " +"means that the Git repositories are available from the URL " "" -msgstr "意思是Subversion版本库的URL是" +msgstr "意思是Git版本库的URL是" #. (systemitem) #: ../source/TortoiseGit_en.xml:1800 @@ -2683,22 +2683,22 @@ msgstr "http://MyServer/svn/" #: ../source/TortoiseGit_en.xml:1805 msgid "" "tells Apache which module will be responsible to serve that URL - in this " -"case the Subversion module." -msgstr "告诉Apache是哪个模块响应那个URL的请求－此刻是Subversion模块。" +"case the Git module." +msgstr "告诉Apache是哪个模块响应那个URL的请求－此刻是Git模块。" #. (entry) #: ../source/TortoiseGit_en.xml:1812 msgid "" -"For Subversion version 1.3 and higher, this directive enables listing all the " +"For Git version 1.3 and higher, this directive enables listing all the " "available repositories under ." msgstr "" -"对于 Subversion 1.3 或者更高版本，这个指示会列出所有 中的版本" +"对于 Git 1.3 或者更高版本，这个指示会列出所有 中的版本" "库。" #. (entry) #: ../source/TortoiseGit_en.xml:1820 -msgid "tells Subversion to look for repositories below " -msgstr "告诉Subversion需要查看的版本库位于之下" +msgid "tells Git to look for repositories below " +msgstr "告诉Git需要查看的版本库位于之下" #. (filename) #: ../source/TortoiseGit_en.xml:1822 @@ -2729,8 +2729,8 @@ msgstr "指定使用的认证密码文件" #. (entry) #: ../source/TortoiseGit_en.xml:1854 -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "位置Subversion版本库的访问控制文件的路径" +msgid "Location of the Access file for paths inside a Git repository" +msgstr "位置Git版本库的访问控制文件的路径" #. (entry) #: ../source/TortoiseGit_en.xml:1861 @@ -2768,11 +2768,11 @@ msgid "" "access to each folder inside a repository you can uncomment the line " "\n" "#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that " +" and create a Git access file. Apache will make sure that " "only valid users are able to access your /svn location, " -"and will then pass the username to Subversion's AuthzSVNAccessFileAuthzSVNAccessFile module so that it can enforce more granular access based upon rules " -"listed in the Subversion access file. Note that paths are specified either as " +"listed in the Git access file. Note that paths are specified either as " "repos:path or simply path. If you don't " "specify a particular repository, that access rule will apply to all " "repositories under SVNParentPath. The format of the " @@ -2782,9 +2782,9 @@ msgstr "" "使用 passwd 可以整体的控制对版本库的访问，但是如果你希望" "精确的控制版本库目录访问，你可以去掉下行的注释\n" "#AuthzSVNAccessFile svnaccessfile\n" -"，并且创建 Subversion 的访问控制文件。Apache 将会确保只有有效的用户可" -"以访问你的 /svn 目录，然后将用户名传递给 Subversion 的 " -"AuthzSVNAccessFile 模块，这样就可以根据 Subversion 访问控制文件内的规则实现更" +"，并且创建 Git 的访问控制文件。Apache 将会确保只有有效的用户可" +"以访问你的 /svn 目录，然后将用户名传递给 Git 的 " +"AuthzSVNAccessFile 模块，这样就可以根据 Git 访问控制文件内的规则实现更" "细粒度的访问控制。请注意路径可以是 repos:path 或简单的 " "path，如果你不指定特定的版本库，访问控制规则会应用到 " "SVNParentPath 下所有的版本库。使用的授权策略文件的格式在" @@ -2851,7 +2851,7 @@ msgstr "项目索引" #: ../source/TortoiseGit_en.xml:1955 msgid "" "If you used the SVNParentPath directive then you don't " -"have to change the Apache config file every time you add a new Subversion " +"have to change the Apache config file every time you add a new Git " "repository. Simply create the new repository under the same location as the " "first repository and you're done! In my company I have direct access to that " "specific folder on the server via SMB (normal windows file access). So I just " @@ -2859,7 +2859,7 @@ msgid "" "TortoiseGitCreate repository " "here... and a new project has a home..." msgstr "" -"如果你使用 SVNParentPath 指示，你就不必在每次添加新 Subversion 版本库时修改 " +"如果你使用 SVNParentPath 指示，你就不必在每次添加新 Git 版本库时修改 " "Apache 的配置文件，只需要在第一个版本库所在的位置建立新的版本库就可以了。在我" "的公司，我可以使用 SMB(普通的 windows 文件访问)直接访问服务器的文件夹，所以我" "直接在那里创建一个目录，运行 TortoiseGit 命令" @@ -2869,12 +2869,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:1969 msgid "" -"If you are using Subversion 1.3 or later, you can use the " +"If you are using Git 1.3 or later, you can use the " "SVNListParentPath on directive to allow Apache to produce " "a listing of all available projects if you point your browser at the parent " "path rather than at a specific repository." msgstr "" -"如果你使用 Subversion 1.3 或更高版本，可以使用 SVNListParentPath onSVNListParentPath on 指示，这样当你使用浏览器访问父路径而不是具体某个版本库时 Apache 就会" "显示所有版本库列表。" @@ -2893,11 +2893,11 @@ msgstr "授权" msgid "" "The mod_authz_svn module permits fine-grained control of " "access permissions based on user names and repository paths. This is " -"available with the Apache server, and as of Subversion 1.3 it is available " +"available with the Apache server, and as of Git 1.3 it is available " "with svnserve as well." msgstr "" "mod_authz_svn 模块可以根据用户名和路径实现细粒度的权限控" -"制，它对 Apache 服务器有效，在 Subversion 1.3 以上版本的 svnserve 中也实现了基" +"制，它对 Apache 服务器有效，在 Git 1.3 以上版本的 svnserve 中也实现了基" "于路径的授权。" #. (para) @@ -3075,7 +3075,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" -"To make the Subversion location use this type of authentication you have to " +"To make the Git location use this type of authentication you have to " "change the line \n" "AuthType Basic\n" " to \n" @@ -3092,7 +3092,7 @@ msgid "" "don't have a domain controller, leave the name of the domain control as " "<domaincontroller>." msgstr "" -"为了让 Subversion 领域使用此认证类型，你需要将\n" +"为了让 Git 领域使用此认证类型，你需要将\n" "AuthType Basic\n" " 修改为 \n" "AuthType SSPI\n" @@ -3139,11 +3139,11 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2140 msgid "" -"Subversion AuthzSVNAccessFile files are case sensitive " +"Git AuthzSVNAccessFile files are case sensitive " "in regard to user names (JUser is different from " "juser)." msgstr "" -"Subversion 的 AuthzSVNAccessFile 文件对用户名大小写敏感" +"Git 的 AuthzSVNAccessFile 文件对用户名大小写敏感" "(JUser 与 juser 不同)。" #. (para) @@ -3160,11 +3160,11 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2150 msgid "" "This difference can bite you when using SSPI authentication as the windows " -"domain and user names are passed to Subversion in the same case as the user " +"domain and user names are passed to Git in the same case as the user " "types them in at the prompt. Internet Explorer often passes the username to " "Apache automatically using whatever case the account was created with." msgstr "" -"使用SSPI的一个问题是用户名和密码是用户在提示输入时发送到Subversion的，而IE经常" +"使用SSPI的一个问题是用户名和密码是用户在提示输入时发送到Git的，而IE经常" "会不管你的帐户是如何建立的都会自动发送你的用户名。" #. (para) @@ -3185,12 +3185,12 @@ msgstr "" msgid "" "Apache's Error and Access logs are your best friend in deciphering problems " "such as these as they will help you determine the username string passed onto " -"Subversion's AuthzSVNAccessFile module. You may need to " +"Git's AuthzSVNAccessFile module. You may need to " "experiment with the exact format of the user string in the " "svnaccessfile (e.g. DOMAIN\\user vs. " "DOMAIN//user) in order to get everything working." msgstr "" -"Apache 的错误和访问日志是你最好的朋友，例如帮助你检测传递给 Subversion 的 " +"Apache 的错误和访问日志是你最好的朋友，例如帮助你检测传递给 Git 的 " "AuthzSVNAccessFile 模块的用户名，你或许需要试验 svnaccessfile 中用户字符串的精" "确格式(例如 DOMAIN\\user 还是 DOMAIN//user)来使一切工作正常。" @@ -3209,11 +3209,11 @@ msgstr "多重认证" #: ../source/TortoiseGit_en.xml:2184 msgid "" "It is also possible to have more than one authentication source for your " -"Subversion repository. To do this, you need to make each authentication type " +"Git repository. To do this, you need to make each authentication type " "non-authoritative, so that Apache will check multiple sources for a matching " "username/password." msgstr "" -"也可以为Subversion使用不止一个的认证源，为此，你需要将每一种认证设置为non-" +"也可以为Git使用不止一个的认证源，为此，你需要将每一种认证设置为non-" "authoritative，这样Apache会在多个源检查用户名/密码。" #. (para) @@ -3254,7 +3254,7 @@ msgid "" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -3280,7 +3280,7 @@ msgstr "" "SVNListParentPath on\n" "SVNParentPath D:\\SVN\n" "\n" -"AuthName \"Subversion repositories\"\n" +"AuthName \"Git repositories\"\n" "AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" @@ -3427,12 +3427,12 @@ msgid "" "windows domain you will encounter that browsing the repository with the " "Internet Explorer doesn't work anymore. Don't worry - this is only the " "Internet Explorer not able to authenticate. Other browsers don't have that " -"problem and TortoiseGit and any other Subversion client are still able to " +"problem and TortoiseGit and any other Git client are still able to " "authenticate." msgstr "" "如果你使用SSL保护你的服务器，并使用windows域来进行认证，你会发现不能使用IE浏览" "版本库了，不需要担心－那只是因为IE没有经过认证，其他浏览器没有这个问题，" -"TortoiseGit和其他Subversion客户端仍然可以得到认证。" +"TortoiseGit和其他Git客户端仍然可以得到认证。" #. (para) #: ../source/TortoiseGit_en.xml:2348 @@ -3446,12 +3446,12 @@ msgstr "如果你一直希望使用IE浏览你的版本库，你可以选择:

<Location /path> directive in the " "Apache config file, and add the SSPIBasicPreferred On. " -"This will allow IE to authenticate again, but other browsers and Subversion " +"This will allow IE to authenticate again, but other browsers and Git " "won't be able to authenticate against that location." msgstr "" "在 Apache 的配置文件定义一个单独的 <Location /path> " "指示，增加 SSPIBasicPreferred On。这将使 IE 能够认证，但是" -"其他浏览器和 Subversion 不能对这个领域认证。" +"其他浏览器和 Git 不能对这个领域认证。" #. (para) #: ../source/TortoiseGit_en.xml:2363 @@ -3499,11 +3499,11 @@ msgstr "强制 SSL 访问" msgid "" "When you've set up SSL to make your repository more secure, you might want to " "disable the normal access via non-SSL (http) and only allow https access. To " -"do this, you have to add another directive to the Subversion <" +"do this, you have to add another directive to the Git <" "Location> block: SSLRequireSSL." msgstr "" "当你设置了 SSL 让你的版本库更安全，你一定希望关闭普通的非 SSL (http) 访问。为" -"此，你需要在 Subversion 的 <Location> 增加指示: " +"此，你需要在 Git 的 <Location> 增加指示: " "SSLRequireSSL。" #. (para) @@ -3517,7 +3517,7 @@ msgid "" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" -" AuthName \"Subversion repositories\"\n" +" AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" @@ -3530,7 +3530,7 @@ msgstr "" "SVNParentPath D:\\SVN\n" "SSLRequireSSL\n" "AuthType Basic\n" -"AuthName \"Subversion repositories\"\n" +"AuthName \"Git repositories\"\n" "AuthUserFile passwd\n" "#AuthzSVNAccessFile svnaccessfile\n" "Require valid-user\n" @@ -3553,7 +3553,7 @@ msgid "" "In some server configurations you may need to setup a single server " "containing 2 virtual SSL hosts: The first one for public web access, with no " "requirement for a client certificate. The second one to be secure with a " -"required client certificate, running a Subversion server." +"required client certificate, running a Git server." msgstr "" #. (para) @@ -3572,7 +3572,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2440 msgid "" "The solution is to add the following directive to the virtual host directory " -"that you want to lock down for Subversion: \n" +"that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client " "certificate was received and verified successfully." @@ -3592,10 +3592,10 @@ msgid "" " </Directory>\n" "</VirtualHost>\n" "\n" -"### Virtual host configuration for SUBVERSION \n" +"### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" -" <Directory \"subversion host root path\">\n" +" <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" @@ -3616,10 +3616,10 @@ msgstr "基于 svnserve 的服务器" #: ../source/TortoiseGit_en.xml:2485 msgid "" "There may be situations where it's not possible to use Apache as your server. " -"Fortunately, Subversion includes Svnserve - a lightweight stand-alone server " +"Fortunately, Git includes Svnserve - a lightweight stand-alone server " "which uses a custom protocol over an ordinary TCP/IP connection." msgstr "" -"有一些情况下，不能使用Apache作为你的服务器，Subversion包括Svnserve－一个轻型的" +"有一些情况下，不能使用Apache作为你的服务器，Git包括Svnserve－一个轻型的" "独立服务器，使用普通TCP/IP连接之上的自定义协议。" #. (para) @@ -3639,12 +3639,12 @@ msgstr "安装 svnserve" #. (para) #: ../source/TortoiseGit_en.xml:2502 msgid "" -"Get the latest version of Subversion from http://" -"subversion.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www." -"collab.net/downloads/subversion. This installer will " +"url=\"http://www.collab.net/downloads/Git\">http://www." +"collab.net/downloads/Git. This installer will " "setup svnserve as a Windows service, and also includes some of the tools you " "need if you are going to use SASL for security." msgstr "" @@ -3652,24 +3652,24 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:2516 msgid "" -"If you already have a version of Subversion installed, and svnserve is " +"If you already have a version of Git installed, and svnserve is " "running, you will need to stop it before continuing." msgstr "" -"如果你已经安装了Subversion，svnserve已经运行，你需要在继续之前把它停下来。" +"如果你已经安装了Git，svnserve已经运行，你需要在继续之前把它停下来。" #. (para) #: ../source/TortoiseGit_en.xml:2522 #, fuzzy msgid "" -"Run the Subversion installer. If you run the installer on your server " +"Run the Git installer. If you run the installer on your server " "(recommended) you can skip step 4." -msgstr "运行Subversion安装程序，如果你在你的服务器上运行，可以跳过第4步。" +msgstr "运行Git安装程序，如果你在你的服务器上运行，可以跳过第4步。" #. (para) #: ../source/TortoiseGit_en.xml:2528 msgid "" -"Open the windows-explorer, go to the installation directory of Subversion " -"(usually C:\\Program Files\\Subversion) and in the " +"Open the windows-explorer, go to the installation directory of Git " +"(usually C:\\Program Files\\Git) and in the " "bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dllbin directory, into a directory on your server e.g. " "c:\\svnserve" msgstr "" -"打开资源管理器，进入Subversion的安装目录(通常是C:\\Program Files" -"\\Subversion)的bin目录，找到文件" +"打开资源管理器，进入Git的安装目录(通常是C:\\Program Files" +"\\Git)的bin目录，找到文件" "svnserve.exe，intl3_svn.dll，" "libapr.dll，libapriconv.dll，" "libapriutil.dll，libdb*.dll，" @@ -3790,11 +3790,11 @@ msgid "" "Running svnserve as a user is usually not the best way. It means always " "having a user logged in on your server, and remembering to restart it after a " "reboot. A better way is to run svnserve as a windows service. Starting with " -"Subversion 1.4, svnserve can be installed as a native windows service." +"Git 1.4, svnserve can be installed as a native windows service." msgstr "" "使用普通用户直接运行 svnserve 通常不是最好的方法。它意味着你的服务器必须有一个" "用户登录，还要记着重新启动服务器后重新启动 svnserve。最好的方法是将 svnserve " -"作为 windows 服务运行。从 Subversion 1.4 开始，svnserve 可以安装为 windows 服" +"作为 windows 服务运行。从 Git 1.4 开始，svnserve 可以安装为 windows 服" "务。" #. (para) @@ -3805,32 +3805,32 @@ msgid "" "command all on one line to create a service which is automatically started " "when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) " "quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" -" \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" \n" +" \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This " "will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "为了将 svnserve 安装为 Windows 服务，在一行内执行下面的命令，创建一个当 " "Windows 启动后，自动启动的服务。\n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip start= auto\n" +" --root c:\\repos\" displayname= \"Git\" depend= tcpip start= auto\n" " 如果任一个路径包含空格，你必须使用双引号(逃逸字符)包含路径，例如：" "\n" -"sc create svnserve binpath= \"\\\"C:\\Program Files\\Subversion\\bin" +"sc create svnserve binpath= \"\\\"C:\\Program Files\\Git\\bin" "\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" depend= tcpip " +" --service --root c:\\repos\" displayname= \"Git\" depend= tcpip " "start= auto\n" " 在创建服务以后，你还可以增加描述。它在 Windows 服务管理器中显示。" "\n" -"sc description svnserve \"Subversion server (svnserve)\"\n" +"sc description svnserve \"Git server (svnserve)\"\n" "" #. (para) @@ -3855,7 +3855,7 @@ msgid "" "append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" " Note that you would have to give the Local Service account " -"appropriate rights to both Subversion and your repositories, as well as any " +"appropriate rights to both Git and your repositories, as well as any " "applications which are used by hook scripts. The built-in group for this is " "called \"LOCAL SERVICE\"." msgstr "" @@ -3865,7 +3865,7 @@ msgstr "" "Security Planning Guide。以本地服务帐户创建服务，需要在上" "面的例子里追加下面几行。\n" "obj= \"NT AUTHORITY\\LocalService\"\n" -"请注意需要给本地服务帐户一些目录的适当权限，包括的 Subversion 和你的" +"请注意需要给本地服务帐户一些目录的适当权限，包括的 Git 和你的" "版本库，还有所有钩子脚本使用的应用。此帐号的内置组名是\"LOCAL SERVICE\"。" #. (para) @@ -3998,7 +3998,7 @@ msgid "" "If you maintain multiple repositories using the same password database, the " "use of an authentication realm will make life easier for users, as " "TortoiseGit can cache your credentials so that you only have to enter them " -"once. More information can be found in the Subversion book, specifically in " +"once. More information can be found in the Git book, specifically in " "the sections Create a " "'users' file and realm and " "创建用户文件和域 和 Using svnserve with SASL. If you are just " "looking for a simple way to set up secure authentication and encryption on a " @@ -4070,7 +4070,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2810 msgid "" "Second, create a file called svn.conf in a convenient " -"location - typically in the directory where subversion is installed." +"location - typically in the directory where Git is installed." msgstr "" #. (para) @@ -4081,7 +4081,7 @@ msgid "" "Mellon\\Project Cyrus\\SASL Library] and place two new string " "values inside it: SearchPath set to the directory path " "containing the sasl*.dll plug-ins (normally in the " -"Subversion install directory), and ConfFile set to the " +"Git install directory), and ConfFile set to the " "directory containing the svn.conf file. If you used the " "CollabNet installer, these registry keys will already have been created for " "you." @@ -4198,11 +4198,11 @@ msgstr "" #: ../source/TortoiseGit_en.xml:2915 msgid "" "Further information about svnserve can be found in the Version Control with SubversionVersion Control with Git." msgstr "" "更多的关于svnserve的信息可以看《使用 Subversion 进行版本管理》。" +"\">《使用 Git 进行版本管理》。" #. (title) #: ../source/TortoiseGit_en.xml:2923 @@ -4212,7 +4212,7 @@ msgstr "svnserve 基于路径的授权" #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" -"Starting with Subversion 1.3, svnserve supports the same " +"Starting with Git 1.3, svnserve supports the same " "mod_authz_svn path-based authorization scheme that is " "available with the Apache server. You need to edit the conf/" "svnserve.conf file in your repository directory and add a line " @@ -4224,7 +4224,7 @@ msgid "" "can use the same file for several repositories. Read for a description of the file format." msgstr "" -"从Subversion1.3开始，svnserve支持与mod_authz_svn相同的路径" +"从Git1.3开始，svnserve支持与mod_authz_svn相同的路径" "为基础的授权模式，你需要编辑版本库路径下的conf/svnserve.conf引用的授权文件。\n" "[general]\n" @@ -4238,16 +4238,16 @@ msgstr "" msgid "" "No matter which protocol you use to access your repositories, you always need " "to create at least one repository. This can either be done with the " -"Subversion command line client or with TortoiseGit." +"Git command line client or with TortoiseGit." msgstr "" -"无论你用什么协议访问你的版本库，都至少需要创建一个版本库，这可以使用Subversion" +"无论你用什么协议访问你的版本库，都至少需要创建一个版本库，这可以使用Git" "命令行客户端或TortoiseGit完成。" #. (para) #: ../source/TortoiseGit_en.xml:2951 msgid "" -"If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "如果你还没有创建Subversion版本库，是时间开始了。" +"If you haven't created a Git repository yet, it's time to do that now." +msgstr "如果你还没有创建Git版本库，是时间开始了。" #. (title) #: ../source/TortoiseGit_en.xml:2959 @@ -4270,13 +4270,13 @@ msgid "" "use for longer, but since FSFS has now been in use in the field for several " "years, that argument is now rather weak. Read Choosing a Data Store in the Subversion " +"\">Choosing a Data Store in the Git " "book for more information." msgstr "" "你可以使用 FSFS 或较老的 Berkeley 数据库(BDB)作为版本库的后端，FSFS 格式通常更" "快一点，还容易管理，而且可以正常运行在网络共享磁盘上 或 Windows 98 中。BDB 格" "式曾经简单的被认为更加稳定，因为其经过了更长时间的验证，但是既然 FSFS 已经使用" -"了几年，这个论据已经相当不牢固了。参考 Subversion 手册的 选择数据存储 以获得更多信息。" @@ -4440,11 +4440,11 @@ msgstr "UNC路径" #: ../source/TortoiseGit_en.xml:3094 msgid "" "To access your local repository you need the path to that folder. Just " -"remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward " "slashes throughout." msgstr "" -"为了访问本地版本库，你需要这个文件夹的路径，只要记住Subversion期望所有的版本库" +"为了访问本地版本库，你需要这个文件夹的路径，只要记住Git期望所有的版本库" "路径使用的形式为file:///C:/SVNRepository/，请注意全部使用的是斜杠。" @@ -4518,7 +4518,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3141 msgid "" "Secondly not all network file sharing protocols support the locking that " -"Subversion requires, so you may find your repository gets corrupted. It may " +"Git requires, so you may find your repository gets corrupted. It may " "not happen straight away, but one day two users will try to access the " "repository at the same time." msgstr "" @@ -4669,13 +4669,13 @@ msgid "" "commit changes, it is the revision number of the whole repository which " "changes, not the revision number of the project. Having 2 unrelated projects " "share a repository can mean large gaps in the revision numbers. The " -"Subversion and TortoiseGit projects appear at the same host address, but are " +"Git and TortoiseGit projects appear at the same host address, but are " "completely separate repositories allowing independent development, and no " "confusion over build numbers." msgstr "" "对于不相关的项目，你可能更愿意使用不同的版本库。当你提交时，改变的是整个版本库" "的修订号，而不是项目的。让两个不相关的项目共用一个版本库，会导致修订号出现较大" -"的跳跃。Subversion和TortoiseGit项目看起来是在同一个主机地址，但是它们是在完全" +"的跳跃。Git和TortoiseGit项目看起来是在同一个主机地址，但是它们是在完全" "独立的版本库中开发着，并且版本号也不相干。" #. (para) @@ -4824,20 +4824,20 @@ msgstr "" #: ../source/TortoiseGit_en.xml:3332 msgid "" "The svnadmin tool is installed automatically when you " -"install the Subversion command line client. If you are installing the command " +"install the Git command line client. If you are installing the command " "line tools on a Windows PC, the best way is to download the Windows installer " "version. It is compressed more efficiently than the .zip " "version, so the download is smaller, and it takes care of setting the paths " -"for you. You can download the latest version of the Subversion command line " -"client from http://subversion.tigris.org/" +"for you. You can download the latest version of the Git command line " +"client from http://Git.tigris.org/" "servlets/ProjectDocumentList?folderID=91." msgstr "" -"svnadmin在安装Subversion命令行客户端时会自动安装，如果你在" +"svnadmin在安装Git命令行客户端时会自动安装，如果你在" "Windows PC上安装这个命令行工具，最好的方式是下载Windows安装版本，它比" ".zip版本的压缩效率更好，所以更小，并且小心的为你设定路" -"径。你可以从http://subversion.tigris.org/" +"径。你可以从http://Git.tigris.org/" "servlets/ProjectDocumentList?folderID=91下载最新版本的命令" "行客户端。" @@ -4874,12 +4874,12 @@ msgid "" "continue the action, stop it, or suspend it in some way. Please refer to the " "chapter on Hook Scripts in the Subversion Book for full details about the hooks " +"citetitle> in the Git Book for full details about the hooks " "which are implemented." msgstr "" "钩子脚本是被一些版本库事件触发的程序，例如创建新版本，或修改非版本控制的属性。" "每种钩子都会被告知事件的足够信息，操作的目标，触发事件的用户名。依赖于钩子的输" -"出或返回状态，钩子程序可以继续执行，停止或以某种方式挂起。请参阅 Subversion 手" +"出或返回状态，钩子程序可以继续执行，停止或以某种方式挂起。请参阅 Git 手" "册的 钩子脚本 部" "分以获得关于实现钩子的细节。" @@ -4951,12 +4951,12 @@ msgstr "WEB 站点" #. (para) #: ../source/TortoiseGit_en.xml:3411 msgid "" -"If you want to make your Subversion repository available to others you may " +"If you want to make your Git repository available to others you may " "want to include a link to it from your website. One way to make this more " "accessible is to include a checkout link for other " "TortoiseGit users." msgstr "" -"如果你希望你的 Subversion 版本库对于别人可用，你可以在你的站点包含一个链接。为" +"如果你希望你的 Git 版本库对于别人可用，你可以在你的站点包含一个链接。为" "了让其更加容易访问，你可以为其它 TortoiseGit 用户包含一个检出链接。" @@ -5051,35 +5051,35 @@ msgstr "日常使用指南" msgid "" "This document describes day to day usage of the TortoiseGit client. It is " "not an introduction to version control systems, and " -"not an introduction to Subversion (SVN). It is more like " +"not an introduction to Git (SVN). It is more like " "a place you may turn to when you know approximately what you want to do, but " "don't quite remember how to do it." msgstr "" "本文目的在与描述TortoiseGit客户端的日常使用。不是一个版本" -"控制系统指南，也不是Subversion (SVN)的指南。本文档的价值" +"控制系统指南，也不是Git (SVN)的指南。本文档的价值" "在于，当你知道大概要做什么，却又记不起应该怎么做的时候，可以有个参考的地方。" #. (para) #: ../source/TortoiseGit_en.xml:3465 msgid "" -"If you need an introduction to version control with Subversion, then we " +"If you need an introduction to version control with Git, then we " "recommend you read the fantastic book: Version Control with Subversion." +"com/\">Version Control with Git." msgstr "" -"如果你需要了解使用Subversion进行版本控制的指南，我们建立你阅读以下这本梦幻之" -"书: 《使用 Subversion " +"如果你需要了解使用Git进行版本控制的指南，我们建立你阅读以下这本梦幻之" +"书: 《使用 Git " "进行版本管理》." #. (para) #: ../source/TortoiseGit_en.xml:3472 msgid "" -"This document is also a work in progress, just as TortoiseGit and Subversion " +"This document is also a work in progress, just as TortoiseGit and Git " "are. If you find any mistakes, please report them to the mailing list so we " "can update the documentation. Some of the screenshots in the Daily Use Guide " "(DUG) might not reflect the current state of the software. Please forgive us. " "We're working on TortoiseGit in our free time." msgstr "" -"本文档与TortoiseGit和Subversion一样，也是处于“正在开发”的状态。如果你找到了错" +"本文档与TortoiseGit和Git一样，也是处于“正在开发”的状态。如果你找到了错" "误之处，请向邮件列表报告，这样我们就可以更新它。日常使用指南(DUG)中的一些屏幕" "截图也许不符合当前软件中的情况。请您原谅我们。毕竟我们只是用业余的时间在制作" "TortoiseGit 。" @@ -5101,14 +5101,14 @@ msgstr "你应该熟悉版本控制系统。" #. (para) #: ../source/TortoiseGit_en.xml:3494 -msgid "You should know the basics of Subversion." -msgstr "你应该知道Subversion的基础。" +msgid "You should know the basics of Git." +msgstr "你应该知道Git的基础。" #. (para) #: ../source/TortoiseGit_en.xml:3499 msgid "" -"You should have set up a server and/or have access to a Subversion repository." -msgstr "你应该已经建立了一个服务器并且可以访问Subversion库。" +"You should have set up a server and/or have access to a Git repository." +msgstr "你应该已经建立了一个服务器并且可以访问Git库。" #. (title) #: ../source/TortoiseGit_en.xml:3510 @@ -5334,14 +5334,14 @@ msgid "" "If the repository that you are trying to access is password protected, an " "authentication Dialog will show up. Enter your username and " "password. The checkbox will make TortoiseGit store the credentials in " -"Subversion's default directory: %APPDATA%\\Subversion\\auth%APPDATA%\\Git\\auth in three subdirectories: " msgstr "" "如果连接的版本库需要口令，就会显示认证对话框。 输入你的用户名" -"和口令。其检查框能让 TortoiseGit 在 Subversion的 缺省目录：%APPDATA%" -"\\Subversion\\auth 的三个子目录内保存认证信息： 每" +"和口令。其检查框能让 TortoiseGit 在 Git的 缺省目录：%APPDATA%" +"\\Git\\auth 的三个子目录内保存认证信息： 每" "个文件对应一个服务器，文件是纯文本格式，因此可以用文本编辑器查看文件是对应哪个" -"服务器。如果希望 Subversion 和 TortoiseGit(或者其它 Subversion 客户端) 忘记某" +"服务器。如果希望 Git 和 TortoiseGit(或者其它 Git 客户端) 忘记某" "个服务器的凭证信息，只需删除这个服务器的对应文件即可。" #. (title) @@ -5379,12 +5379,12 @@ msgid "" "If you want to clear the authentication cache for all servers, you can do so " "from the Saved Data page of TortoiseGit's settings " "dialog. That button will clear all cached authentication data from the " -"Subversion auth directories, as well as any " +"Git auth directories, as well as any " "authentication data stored in the registry by earlier versions of " "TortoiseGit. Refer to ." msgstr "" "如果想要清除所有服务器的认证缓存，可以通过 TortoiseGit 设" -"置对话框的常规设置页来实现。那个按钮能够清除 Subversion " +"置对话框的常规设置页来实现。那个按钮能够清除 Git " "的 auth 目录中缓存的所有认证数据，以及老版本的 TortoiseGit 存储在注册表里的认" "证数据。请参考 。" @@ -5464,7 +5464,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:3736 msgid "" -"This section describes the Subversion import command, which was designed for " +"This section describes the Git import command, which was designed for " "importing a directory hierarchy into the repository in one shot. Although it " "does the job, it has several shortcomings: For these reasons " "we recommend that you do not use the import command at all but rather follow " @@ -5707,11 +5707,11 @@ msgstr "" msgid "" "So as not to disturb the users, we also added the file TortoiseVars." "bat to the ignore list of its parent folder, i.e. we've set the " -"Subversion property svn:ignore to include that filename. " +"Git property svn:ignore to include that filename. " "That way it won't show up as unversioned on every commit." msgstr "" "于是为了不干扰用户，我们也将TortoiseVars.bat增加到它的父" -"目录的忽略列表，也就是，我们设置了Subversion属性svn:ignore" +"目录的忽略列表，也就是，我们设置了Git属性svn:ignore" "包含这个文件名称。这样，每次提交时它都不会作为没有版本控制的文件出现。" #. (title) @@ -5752,7 +5752,7 @@ msgid "" "\\project1, right click and choose " "Windows MenuProperties from the context menu. The Properties Dialog comes " -"up. Then go to the Subversion tab. There, you can set properties. Click " +"up. Then go to the Git tab. There, you can set properties. Click " "Add.... Select the svn:externals " "property from the combobox and write in the edit box the repository URL in " "the format name url or if you want to specify a particular " @@ -5766,7 +5766,7 @@ msgid "" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" " Now click Set and commit your changes. When " -"you (or any other user) update your working copy, Subversion will create a " +"you (or any other user) update your working copy, Git will create a " "sub-folder D:\\dev\\project1\\sounds and checkout the " "sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder " @@ -5776,7 +5776,7 @@ msgstr "" "比如说，你检出了/project1到 D:\\dev\\project1。选择目录D:\\dev\\project1，右击，选择Windows 菜单属性。出现属性对话框。在Subversion页，你可以设置属性。点" +"guimenuitem>。出现属性对话框。在Git页，你可以设置属性。点" "击增加...。从组合框选择svn:externals" "属性，在编辑框按照名称 URL格式输入版本库URL，或者你需要一个" "指定的版本，那么使用名称 -r版本 URL。你可以增加多个外部工" @@ -5787,7 +5787,7 @@ msgstr "" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" " 现在点击 设置，提交你的修改。当你(或其他用户)" -"更新工作副本时， Subversion 将会创建子目录D:\\dev\\project1" +"更新工作副本时， Git 将会创建子目录D:\\dev\\project1" "\\sounds，并且检出sounds工程，另一个子目录D:\\dev" "\\project1\\quick_graphs包含graphics工程，最后一个嵌套的子目录" "D:\\dev\\project1\\skins\\toolkit包含的skin-maker工程的版" @@ -5850,7 +5850,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4016 msgid "" -"To avoid such problems, Subversion clients version 1.5 and higher support " +"To avoid such problems, Git clients version 1.5 and higher support " "relative external URLs. Four different methods of specifying a relative URL " "are supported. In the following examples, assume we have two repositories: " "one at http://example.com/svn/repos-1 " @@ -6183,7 +6183,7 @@ msgstr "" msgid "" "Navigate to Project76/SubProj and do the same. This time " "note that the Project76 folder has no content except for " -"SubProj, which itself is fully populated. Subversion has " +"SubProj, which itself is fully populated. Git has " "created the intermediate folders for you without populating them." msgstr "" @@ -6198,7 +6198,7 @@ msgid "" "Once you have checked out a working copy to a particular depth you can " "increase that depth later to get more content. However you cannot reduce the " "depth again to remove content. That feature may be added in a later version " -"of Subversion." +"of Git." msgstr "" #. (title) @@ -6471,14 +6471,14 @@ msgid "" "released automatically after the commit succeeds. If you want to keep those " "locks, make sure the Keep locks checkbox is checked. The " "default state of this checkbox is taken from the no_unlock " -"option in the Subversion configuration file. Read for information on how to edit the Subversion configuration " +"option in the Git configuration file. Read for information on how to edit the Git configuration " "file." msgstr "" "缺省情况下，当你成功提交修改后，你在这些文件上持有的锁会被自动释放。如果你需要" "保留锁，请确认选中检查框保留锁。此检查框的缺省状态从 " -"Subversion 配置文件的 no_unlock 选项获取。参考 以获得更多关于编辑 Subversion 配置文件的" +"Git 配置文件的 no_unlock 选项获取。参考 以获得更多关于编辑 Git 配置文件的" "信息。" #. (para) @@ -6514,15 +6514,15 @@ msgstr "修复外部改名" #. (para) #: ../source/TortoiseGit_en.xml:4523 ../source/TortoiseGit_en.xml:5324 msgid "" -"Sometimes files get renamed outside of Subversion, and they show up in the " +"Sometimes files get renamed outside of Git, and they show up in the " "file list as a missing file and an unversioned file. To avoid losing the " -"history you need to notify Subversion about the connection. Simply select " +"history you need to notify Git about the connection. Simply select " "both the old name (missing) and the new name (unversioned) and use " "Context MenuRepair Move to pair the two files as a rename." msgstr "" -"有时候文件不是用Subversion改名，于是它们在文件列表中作为丢失和未版本控制的文件" -"出现。为了避免丢失历史，你需要通知Subversion。简单的选择老名称(丢失)和新名称" +"有时候文件不是用Git改名，于是它们在文件列表中作为丢失和未版本控制的文件" +"出现。为了避免丢失历史，你需要通知Git。简单的选择老名称(丢失)和新名称" "(未版本控制)，然后使用右键菜单修复" "移动来指明这两个文件是改名关系。" @@ -6535,7 +6535,7 @@ msgstr "修改列表" #. (para) #: ../source/TortoiseGit_en.xml:4539 msgid "" -"The commit dialog supports Subversion's changelist feature to help with " +"The commit dialog supports Git's changelist feature to help with " "grouping related files together. Find out about this feature in ." msgstr "" @@ -7004,15 +7004,15 @@ msgstr "本地文件已经存在" msgid "" "Sometimes when you try to update, the update fails with a message to say that " "there is already a local file of the same name. This typically happens when " -"Subversion tries to checkout a newly versioned file, and finds that an " +"Git tries to checkout a newly versioned file, and finds that an " "unversioned file of the same name already exists in your working folder. " -"Subversion will never overwrite an unversioned file - it might contain " +"Git will never overwrite an unversioned file - it might contain " "something you are working on, which coincidentally has the same filename as " "another developer has used for his newly committed file." msgstr "" "有时在你试图更新的时候，更新失败，提示信息说已经有一个同名的本地文件。通常发生" -"在Subversion试图检出一个新增的受控文件时，发现一个未受控的同名文件已经在工作路" -"径中存在。Subversion绝不会覆盖一个未受控的文件——因为它有可能有你需要的东西，却" +"在Git试图检出一个新增的受控文件时，发现一个未受控的同名文件已经在工作路" +"径中存在。Git绝不会覆盖一个未受控的文件——因为它有可能有你需要的东西，却" "碰巧与另一个开发者新提交的文件重名了。" #. (para) @@ -7052,7 +7052,7 @@ msgstr "解决" msgid "" "Once in a while, you will get a conflict when you update " "your files from the repository. A conflict occurs when two or more developers " -"have changed the same few lines of a file. As Subversion knows nothing of " +"have changed the same few lines of a file. As Git knows nothing of " "your project, it leaves resolving the conflicts to the developers. Whenever a " "conflict is reported, you should open the file in question, and search for " "lines starting with the string <<<<<<< Also, for every conflicted file Subversion places three additional " +" Also, for every conflicted file Git places three additional " "files in your directory: " msgstr "" "有时当你从版本库中更新你的文件时，会有冲突。冲突出现的原" -"因是两个开发人员修改了文件中相同的几行。由于Subversion不知道你的项目的具体情" +"因是两个开发人员修改了文件中相同的几行。由于Git不知道你的项目的具体情" "况，它把解决冲突的工作留给了开发人员。一旦出现冲突，你就应该打开有问题的文件，" "查找以字符串<<<<<<<开头的行。有冲突的" "区域用如下的方式标记: \n" @@ -7075,7 +7075,7 @@ msgstr "" "=======\n" " 来自版本库中的代码\n" ">>>>>>> revision\n" -" 对于每个冲突的文件Subversion在你的目录下放置了三个文件: " +" 对于每个冲突的文件Git在你的目录下放置了三个文件: " "" #. (term) @@ -7116,11 +7116,11 @@ msgstr "filename.ext.rNEWREV" #. (para) #: ../source/TortoiseGit_en.xml:4947 msgid "" -"This is the file that your Subversion client just received from the server " +"This is the file that your Git client just received from the server " "when you updated your working copy. This file corresponds to the HEAD " "revision of the repository." msgstr "" -"这个文件是当你更新你的工作副本时，你的Subversion客户端从服务器接收到的。这个文" +"这个文件是当你更新你的工作副本时，你的Git客户端从服务器接收到的。这个文" "件对应与版本库中的最新版本。" #. (para) @@ -7154,14 +7154,14 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:4981 msgid "" -"If you have conflicts with binary files, Subversion does not attempt to merge " +"If you have conflicts with binary files, Git does not attempt to merge " "the files itself. The local file remains unchanged (exactly as you last " "changed it) and you have filename.ext.r* files. If you " "want to discard your changes and keep the repository version, just use the " "Revert command. If you want to keep your version and overwrite the repository " "version, use the Resolved command, then commit your version." msgstr "" -"如果你的二进制文件有冲突，Subversion不会试图合并文件。本地文件保持不变(完全是" +"如果你的二进制文件有冲突，Git不会试图合并文件。本地文件保持不变(完全是" "你最后修改时的样子)，但你会看到filename.ext.r*文件。如果" "你要撤消你的修改，保留版本库中的版本，请使用还原(Revert)命令。如果你要保持你的" "版本覆盖版本库中的版本，使用已解决命令，然后提交你的版本。" @@ -7225,26 +7225,26 @@ msgstr "图标" #. (para) #: ../source/TortoiseGit_en.xml:5033 msgid "" -"Now that you have checked out a working copy from a Subversion repository you " +"Now that you have checked out a working copy from a Git repository you " "can see your files in the windows explorer with changed icons. This is one of " "the reasons why TortoiseGit is so popular. TortoiseGit adds a so called " "overlay icon to each file icon which overlaps the original file icon. " -"Depending on the Subversion status of the file the overlay icon is different." +"Depending on the Git status of the file the overlay icon is different." msgstr "" -"现在你已经从 Subversion 版本库中检出了一份工作副本，你可以在资源管理器中看一下" +"现在你已经从 Git 版本库中检出了一份工作副本，你可以在资源管理器中看一下" "这些文件的图标有什么变化。这也正是 TortoiseGit 这么流行的原因之一。" "TortoiseGit 加入了被称为重载图标的功能重载了原始的文件图标。根据文件的 " -"Subversion 状态的不同，重载的图标也不同。" +"Git 状态的不同，重载的图标也不同。" #. (para) #: ../source/TortoiseGit_en.xml:5041 msgid "" -" A fresh checked out " -"working copy has a green checkmark as overlay. That means the Subversion " +" A fresh checked out " +"working copy has a green checkmark as overlay. That means the Git " "status is normal." msgstr "" -" 一个新检出的工作副本使用" -"绿色的对勾做重载。表示 Subversion 状态正常." +" 一个新检出的工作副本使用" +"绿色的对勾做重载。表示 Git 状态正常." #. (para) #: ../source/TortoiseGit_en.xml:5046 @@ -7273,25 +7273,25 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5059 msgid "" " If you have set the " -"svn:needs-lock property on a file, Subversion makes that " +"svn:needs-lock property on a file, Git makes that " "file read-only until you get a lock on that file. Such files have this " "overlay to indicate that you have to get a lock first before you can edit " "that file." msgstr "" "如果你给一个文件设置了" -"svn:needs-lock属性，Subversion 会让此文件只读，直到你获得文" +"svn:needs-lock属性，Git 会让此文件只读，直到你获得文" "件锁。具有这个重载图标的文件来表示你必须在编辑之前先得到锁。" #. (para) #: ../source/TortoiseGit_en.xml:5066 msgid "" " If you hold a lock on a file, " -"and the Subversion status is normal, this icon overlay " +"and the Git status is normal, this icon overlay " "reminds you that you should release the lock if you are not using it to allow " "others to commit their changes to the file." msgstr "" "如果你拥有了一个文件的锁，并且 " -"Subversion 状态是正常，这个重载图标就提醒你如果不使用该文" +"Git 状态是正常，这个重载图标就提醒你如果不使用该文" "件的话应该释放锁，允许别人提交对该文件的修改。" #. (para) @@ -7362,10 +7362,10 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5111 msgid "" -"For a description of how icon overlays correspond to Subversion status and " +"For a description of how icon overlays correspond to Git status and " "other technical details, read ." msgstr "" -"要获得图表重载与 Subversion 状态的对应关系，或者其它技术细节，请阅读。" #. (title) @@ -8165,10 +8165,10 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5729 msgid "" "Search log messages for the text you enter. This searches the log messages " -"that you entered and also the action summaries created by Subversion (shown " +"that you entered and also the action summaries created by Git (shown " "in the bottom pane). The search is not case sensitive." msgstr "" -"在日志信息中搜索你输入的的文字。这个操作搜索日志信息，也搜索由Subversion建立的" +"在日志信息中搜索你输入的的文字。这个操作搜索日志信息，也搜索由Git建立的" "提交行为总结(最底部的面板中的内容)。搜索大小写无关。" #. (para) @@ -8304,8 +8304,8 @@ msgstr "还原选中文件的选中版本所作的变更。" #. (para) #: ../source/TortoiseGit_en.xml:5830 -msgid "View the Subversion properties for the selected item." -msgstr "查看选中项的Subversion属性。" +msgid "View the Git properties for the selected item." +msgstr "查看选中项的Git属性。" #. (para) #: ../source/TortoiseGit_en.xml:5835 @@ -8330,14 +8330,14 @@ msgstr "你可能会注意到，我们有时候说改变，有时候说差异。 #: ../source/TortoiseGit_en.xml:5852 #, fuzzy msgid "" -"Subversion uses revision numbers to mean 2 different things. A revision " +"Git uses revision numbers to mean 2 different things. A revision " "generally represents the state of the repository at a point in time, but it " "can also be used to represent the changeset which created that revision, eg. " "Done in r1234 means that the changes committed in r1234 " "implement feature X. To make it clearer which sense is being used, we use two " "different terms." msgstr "" -"Subversion 使用版本号表达两个意思。版本号通常意味着版本库在那个时间的状态，也" +"Git 使用版本号表达两个意思。版本号通常意味着版本库在那个时间的状态，也" "用来表达那个版本创建的结果集，例如 “r1234 所做” 意味着 r1234 版本提交的改变实" "现了特性 X。为了能更清晰的知道使用了哪个语义，我们使用两个不同的术语。" @@ -8345,21 +8345,21 @@ msgstr "" #: ../source/TortoiseGit_en.xml:5861 msgid "" "If you select two revisions N and M, the context menu will offer to show the " -"difference between those two revisions. In Subversion " +"difference between those two revisions. In Git " "terms this is diff -r M:N." msgstr "" "如果你选择了两个版本 N 和 M，上下文菜单会显示这两个版本的差异。用 Subversion 术语说，就是diff -r M:N。" +"emphasis>。用 Git 术语说，就是diff -r M:N。" #. (para) #: ../source/TortoiseGit_en.xml:5867 msgid "" "If you select a single revision N, the context menu will offer to show the " -"changes made in that revision. In Subversion terms this " +"changes made in that revision. In Git terms this " "is diff -r N-1:N or diff -c N." msgstr "" "如果你选择了一个版本 N，上下文菜单会显示这个版本的改变。" -"用 Subversion 术语说，就是diff -r N-1:N 或 diff -" +"用 Git 术语说，就是diff -r N-1:N 或 diff -" "c N。" #. (para) @@ -8437,11 +8437,11 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:5922 msgid "" -"Note that Subversion currently implements renaming as a copy/delete pair, so " +"Note that Git currently implements renaming as a copy/delete pair, so " "renaming a file or folder will also cause the log display to stop if this " "option is checked." msgstr "" -"注意，Subversion当前是用复制/删除来实现重命名的，所以重命名一个文件或文件夹也" +"注意，Git当前是用复制/删除来实现重命名的，所以重命名一个文件或文件夹也" "会造成日志显示停止(如果选择了复制/重命名时停止)在该点。" #. (para) @@ -8522,7 +8522,7 @@ msgstr "合并跟踪记录" #. (para) #: ../source/TortoiseGit_en.xml:5977 msgid "" -"Subversion 1.5 and later keeps a record of merges using properties. This " +"Git 1.5 and later keeps a record of merges using properties. This " "allows us to get a more detailed history of merged changes. For example, if " "you develop a new feature on a branch and then merge that branch back to " "trunk, the feature development will show up on the trunk log as a single " @@ -8580,19 +8580,19 @@ msgstr "" #: ../source/TortoiseGit_en.xml:6018 #, fuzzy msgid "" -"Subversion lets you change both the log message and the author of revisions " +"Git lets you change both the log message and the author of revisions " "any time you want. But since such changes can't be undone (those changes are " "not versioned) this feature is disabled by default. To make this work, you " "must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the " -"Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a " "Windows machine." msgstr "" -"Subversion允许你在任何时候修改日志消息和作者。但这种改变不可还原(不在版本控制" +"Git允许你在任何时候修改日志消息和作者。但这种改变不可还原(不在版本控制" "之下)，正因如此，这些功能默认是不可用的，如果要开启它，必须设置一个pre-" -"revprop-change钩子。具体如何做，请参考《使用 Subversion 进行版本管理》的相关章" +"revprop-change钩子。具体如何做，请参考《使用 Git 进行版本管理》的相关章" "节钩子脚本。在Windows机器上实现钩子的注意事项" "请阅读。" @@ -8612,12 +8612,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6038 msgid "" -"Because Subversion's revision properties are not versioned, making " +"Because Git's revision properties are not versioned, making " "modifications to such a property (for example, the svn:log " "commit message property) will overwrite the previous value of that property " "forever." msgstr "" -"由于Subversion的版本属性不受版本控制，对于这种属性的修改(如 svn:logsvn:log提交信息属性将永久覆盖该属性之前的值。" #. (title) @@ -9065,7 +9065,7 @@ msgstr "WC文件/文件夹与URL之间的比较差异" #, fuzzy msgid "" "If you want to see the differences between a file in your working copy, and a " -"file in any Subversion repository, you can do that directly in explorer by " +"file in any Git repository, you can do that directly in explorer by " "selecting the file then holding down the Shift key whilst " "right clicking to obtain the context menu. Select " "TortoiseGitDiff with URLglobal ignore " "list. The big difference here is that the global ignore list is a " -"client property. It applies to all Subversion projects, " +"client property. It applies to all Git projects, " "but on the client PC only. In general it is better to use the svn:" "ignore property where possible, because it can be applied to " "specific project areas, and it works for everyone who checks out the project. " @@ -9900,7 +9900,7 @@ msgid "" msgstr "" "另一个忽略文件的方法是添加这些文件到global ignore list .他们最大的不同是全局忽略列表是一个客户端特性。它会作用到 " -"所有的(all)subversion 项目。但只能在pc客户端使用。在全局尽可能更好" +"所有的(all)Git 项目。但只能在pc客户端使用。在全局尽可能更好" "的使用svn:ignore特性，因为他能够应用到特殊的项目区域，并" "却他作用于所有检出该项目的人。阅读获" "得更多信息。" @@ -9914,10 +9914,10 @@ msgstr "忽略已版本控制的条目" #: ../source/TortoiseGit_en.xml:6941 msgid "" "Versioned files and folders can never be ignored - that's a feature of " -"Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "" -"已版本控制的文件或目录不能够忽略，这是subversion的一个特性。如果你错误的版本控" +"已版本控制的文件或目录不能够忽略，这是Git的一个特性。如果你错误的版本控" "制了一个文件，阅读介绍怎样取消" "版本控制(unversion)。" @@ -9939,11 +9939,11 @@ msgstr "模式匹配" #. (para) #: ../source/TortoiseGit_en.xml:6956 msgid "" -"Subversion's ignore patterns make use of filename globbing, a technique " +"Git's ignore patterns make use of filename globbing, a technique " "originally used in Unix to specify files using meta-characters as wildcards. " "The following characters have special meaning: " msgstr "" -"Subversion 的忽略模式使用了文件匹配，一种原先在Unix系统中使用meta字符作为通配" +"Git 的忽略模式使用了文件匹配，一种原先在Unix系统中使用meta字符作为通配" "符的技术。下面的字符有着特殊的意思: " #. (term) @@ -9989,12 +9989,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:6996 msgid "" -"Subversion uses the / as the path delimiter in all " +"Git uses the / as the path delimiter in all " "internal pathnames, and all pattern matching is done against this style of " "path names. If you want to use a path delimiter in your ignore pattern, be " "sure to use /, and not the Windows backslash." msgstr "" -"Subversion 在所有内部路径名称中使用 / 作为路径分割符，所有" +"Git 在所有内部路径名称中使用 / 作为路径分割符，所有" "模式匹配都使用这种路径名称风格。如果你想在忽略模式中使用路径分割符，确认使用 " "/, 而不是 Windows 的反斜线符号。" @@ -10013,13 +10013,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7009 msgid "" -"Subversion uses this pattern matching against every path presented to it for " +"Git uses this pattern matching against every path presented to it for " "action. These paths are generally relative to the directory being acted upon " "for import, add, commit, etc. The matching pattern therefore has to take " "account of the fact that there may or may not be path components before the " "filename." msgstr "" -"Subversion 对每个路径使用这种匹配模式。这些路径通常相对于执行导入，增加，提交" +"Git 对每个路径使用这种匹配模式。这些路径通常相对于执行导入，增加，提交" "等动作的目录。因此，此匹配模式考虑在文件名称之前可能有，也可能没有路径组件这个" "事实。" @@ -10030,13 +10030,13 @@ msgid "" "trim them off, so pattern Fred.* will match Fred." "c but not subdir/Fred.c. This is significant if " "you add a folder which contains some files that you want to be ignored, " -"because those filenames will be preceded with the folder name when Subversion " +"because those filenames will be preceded with the folder name when Git " "compares them with the ignore pattern." msgstr "" "如果目录名称在路径中，匹配算法不会删除它们，所以模式Fred.*" "匹配Fred.c，但是不匹配subdir/Fred.c。这" "对于你添加一个包含你想忽略的一些文件的目录来说是非常有意义的，因为在 " -"Subversion 处理忽略模式时，这些文件名的优先级高于目录名。" +"Git 处理忽略模式时，这些文件名的优先级高于目录名。" #. (para) #: ../source/TortoiseGit_en.xml:7025 @@ -10088,11 +10088,11 @@ msgstr "删除、移动和改名" #. (para) #: ../source/TortoiseGit_en.xml:7051 msgid "" -"Unlike CVS, Subversion allows renaming and moving of files and folders. So " +"Unlike CVS, Git allows renaming and moving of files and folders. So " "there are menu entries for delete and rename in the TortoiseGit submenu. " "" msgstr "" -"不像CVS,Subversion允许重命名和移动文件和目录。因此在TortoiseGit 的子菜单中有删" +"不像CVS,Git允许重命名和移动文件和目录。因此在TortoiseGit 的子菜单中有删" "除和重命名的菜单项。" #. (title) @@ -10120,7 +10120,7 @@ msgstr "删除" #, fuzzy msgid "" "Use TortoiseGitDelete to remove files or folders from subversion." +"guimenuitem> to remove files or folders from Git." msgstr "" "TortoiseGit提交父目录。" @@ -10152,13 +10152,13 @@ msgid "" "commit the change, you can get the folder back using " "TortoiseGitRevert on the folder itself. This difference in behaviour between files " -"and folders is a part of Subversion, not TortoiseGit." +"and folders is a part of Git, not TortoiseGit." msgstr "" "当你TortoiseGit删除一个文件，它立即被从工作副本删除，并且标记为下次提交" "从版本库删除。当你TortoiseGit删除" "一个目录，它仍旧在你的工作副本中，但是重载图标指出" -"了它标记为删除。这个区别是 Subversion 的特性，与 TortoiseGit 无关。" +"了它标记为删除。这个区别是 Git 的特性，与 TortoiseGit 无关。" #. (para) #: ../source/TortoiseGit_en.xml:7109 @@ -10182,32 +10182,32 @@ msgid "" "If a file is deleted via the explorer instead of using " "the TortoiseGit context menu, the commit dialog shows those files and lets " "you remove them from version control too before the commit. However, if you " -"update your working copy, Subversion will spot the missing file and replace " +"update your working copy, Git will spot the missing file and replace " "it with the latest version from the repository. If you need to delete a " "version-controlled file, always use TortoiseGitDelete so that Subversion " +"guimenu>Delete so that Git " "doesn't have to guess what you really want to do." msgstr "" "如果一个 文件 是通过浏览器而不是使用TortoiseGit 快捷菜单" "被删除，提交对话框也会显示这些文件并让你在提交前把他们从版本控制中移除。可是," -"如果你更新你的工作副本， Subversion 将会混淆这个丢失文件并替换他为版本库中的最" +"如果你更新你的工作副本， Git 将会混淆这个丢失文件并替换他为版本库中的最" "新版本。因此，如果你需要删除一个版本控制下的文件，请始终使用" "TortoiseGitDelete保证 Subversion不去猜测你到底想干什么。" +"menuchoice>保证 Git不去猜测你到底想干什么。" #. (para) #: ../source/TortoiseGit_en.xml:7134 msgid "" "If a folder is deleted via the explorer instead of using " "the TortoiseGit context menu, your working copy will be broken and you will " -"be unable to commit. If you update your working copy, Subversion will replace " +"be unable to commit. If you update your working copy, Git will replace " "the missing folder with the latest version from the repository and you can " "then delete it the correct way using TortoiseGitDelete." msgstr "" "如果一个 目录 是通过浏览器而不是使用TortoiseGit 快捷菜单" "被删除，你的工作副本将回被损坏，并且你将不能提交。如果你更新你的工作副本，如果" -"你更新你的工作副本， Subversion 将用版本库中的最新版本替换已丢失目录。接下来你" +"你更新你的工作副本， Git 将用版本库中的最新版本替换已丢失目录。接下来你" "就可以使用TortoiseGitDelete这种正确的方法来删除它了。" @@ -10366,12 +10366,12 @@ msgstr "大小写改变" #. (para) #: ../source/TortoiseGit_en.xml:7263 msgid "" -"Making case-only changes to a filename is tricky with Subversion on Windows, " +"Making case-only changes to a filename is tricky with Git on Windows, " "because for a short time during a rename, both filenames have to exist. As " "Windows has a case-insensitive file system, this does not work using the " "usual Rename command." msgstr "" -"在 Windows 中，使用 Subversion 修改文件名称的大小写需要小技巧，因为在改名期" +"在 Windows 中，使用 Git 修改文件名称的大小写需要小技巧，因为在改名期" "间，两个文件名称需要同时存在。因为 Windows 的文件系统是大小写不敏感的，所以使" "用平常的改名命令是不能工作的。" @@ -10381,9 +10381,9 @@ msgstr "" msgid "" "Fortunately there are (at least) two possible methods to rename a file " "without losing its log history. It is important to rename it within " -"subversion. Just renaming in the explorer will corrupt your working copy!" +"Git. Just renaming in the explorer will corrupt your working copy!" msgstr "" -"这里(至少)有两种可能的解决方案来重命名文件而不丢失他的日志记录。在subversion里" +"这里(至少)有两种可能的解决方案来重命名文件而不丢失他的日志记录。在Git里" "重命名它是很重要的。仅在浏览器中重命名将会损坏你的工作副本。" #. (para) @@ -10443,7 +10443,7 @@ msgid "" "If the repository already contains two files with the same name but differing " "only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory " -"on a Windows client. Whilst Subversion supports case-sensitive filenames, " +"on a Windows client. Whilst Git supports case-sensitive filenames, " "Windows does not." msgstr "" "万一在你的版本库中有两个名字相同但大小拼写不同(例如: TEST.TXT和test.txt)的文" @@ -10496,27 +10496,27 @@ msgstr "修复文件改名" #: ../source/TortoiseGit_en.xml:7357 msgid "" "Sometimes your friendly IDE will rename files for you as part of a " -"refactoring exercise, and of course it doesn't tell Subversion. If you try to " -"commit your changes, Subversion will see the old filename as missing and the " +"refactoring exercise, and of course it doesn't tell Git. If you try to " +"commit your changes, Git will see the old filename as missing and the " "new one as an unversioned file. You could just check the new filename to get " -"it added in, but you would then lose the history tracing, as Subversion does " +"it added in, but you would then lose the history tracing, as Git does " "not know the files are related." msgstr "" -"有时候你的IDE会因为执行反射操作，改名文件，当然它不能告诉Subversion。如果你尝" -"试提交修改，Subversion会发现丢失了老文件，新增了未版本控制的新文件。你可以简单" -"的增加新文件，但是你将丢失历史记录，因为Subversion不知道这些文件的关系。" +"有时候你的IDE会因为执行反射操作，改名文件，当然它不能告诉Git。如果你尝" +"试提交修改，Git会发现丢失了老文件，新增了未版本控制的新文件。你可以简单" +"的增加新文件，但是你将丢失历史记录，因为Git不知道这些文件的关系。" #. (para) #: ../source/TortoiseGit_en.xml:7365 msgid "" -"A better way is to notify Subversion that this change is actually a rename, " +"A better way is to notify Git that this change is actually a rename, " "and you can do this within the Commit and " "Check for Modifications dialogs. Simply select both the " "old name (missing) and the new name (unversioned) and use " "Context MenuRepair Move to pair the two files as a rename." msgstr "" -"更好的方法是通知Subversion这实际上是改名，你可以在提交和" +"更好的方法是通知Git这实际上是改名，你可以在提交和" "检查修改对话框中做此操作。简单选择老文件(丢失的)和新文件" "(未版本控制的)，使用右键菜单修复移" "动设置这两个文件是改名关系。" @@ -10530,12 +10530,12 @@ msgstr "删除未版本控制的文件" #: ../source/TortoiseGit_en.xml:7380 msgid "" "Usually you set your ignore list such that all generated files are ignored in " -"Subversion. But what if you want to clear all those ignored items to produce " +"Git. But what if you want to clear all those ignored items to produce " "a clean build? Usually you would set that in your makefile, but if you are " "debugging the makefile, or changing the build system it is useful to have a " "way of clearing the decks." msgstr "" -"通常你可以在Subversion中设置自己的忽略列表，例如忽略所有产生的文件。但是你如何" +"通常你可以在Git中设置自己的忽略列表，例如忽略所有产生的文件。但是你如何" "清理这些忽略的项目，从而产生一个干净的构建呢？通常你在makefile中清理，但是如果" "你在调试makefile，或者修改构建系统，那么有一个清理方法是极为有用的。" @@ -10686,13 +10686,13 @@ msgstr "清理" #. (para) #: ../source/TortoiseGit_en.xml:7482 msgid "" -"If a Subversion command cannot complete successfully, perhaps due to server " +"If a Git command cannot complete successfully, perhaps due to server " "problems, your working copy can be left in an inconsistent state. In that " "case you need to use TortoiseGitCleanup on the folder. It is " "a good idea to do this at the top level of the working copy." msgstr "" -"也许由于服务器问题，一个Subversion指令不能成功地完成，你的工作副本因此被滞留在" +"也许由于服务器问题，一个Git指令不能成功地完成，你的工作副本因此被滞留在" "一个不一致的状态。 那样的话，你需要在该目录上使用" "TortoiseGit清理命令。在工作副本的根目录使用它是一个好主意。" @@ -10702,7 +10702,7 @@ msgstr "" #, fuzzy msgid "" "Cleanup has another useful side effect. If a file date changes but its " -"content doesn't, Subversion cannot tell whether it has really changed except " +"content doesn't, Git cannot tell whether it has really changed except " "by doing a byte-by-byte comparison with the pristine copy. If you have a lot " "of files in this state it makes acquiring status very slow, which will make " "many dialogs slow to respond. Executing a Cleanup on your working copy will " @@ -10710,7 +10710,7 @@ msgid "" "full speed." msgstr "" "清理有另外的一个有用的副作用。如果一个文件日期变化了但是它的内容没变," -"Subversion除了采用byte-by-byte将该文件和原副本进行对照，不能分清它是否真的变" +"Git除了采用byte-by-byte将该文件和原副本进行对照，不能分清它是否真的变" "更。 如果你有很多这种状态下的文件，将会使获得状态非常慢，还会导致许多会话响应" "变慢。在你的工作副本上执行一个清理命令将会修正这些 \" 坏掉的 \" 时戳，从而可以" "全速检查它们的状态。" @@ -10723,12 +10723,12 @@ msgstr "使用提交时戳" #. (para) #: ../source/TortoiseGit_en.xml:7505 msgid "" -"Some earlier releases of Subversion were affected by a bug which caused " +"Some earlier releases of Git were affected by a bug which caused " "timestamp mismatch when you check out with the Use commit " "timestamps option checked. Use the Cleanup command to speed up " "these working copies." msgstr "" -"Subversion的一些早期发布中存在一个bug，当你使用使用提交时戳使用提交时戳选项检出的时候会造成时戳混乱。使用清理命令可以修正工作副本中的这些问" "题。" @@ -10747,70 +10747,70 @@ msgstr "属性" msgid "" " Sometimes you want to have more detailed information about a " "file/directory than just the icon overlay. You can get all the information " -"Subversion provides in the explorer properties dialog. Just select the file " +"Git provides in the explorer properties dialog. Just select the file " "or directory and select Windows Menuproperties in the context " "menu (note: this is the normal properties menu entry the explorer provides, " "not the one in the TortoiseGit submenu!). In the properties dialog box " -"TortoiseGit has added a new property page for files/folders under Subversion " +"TortoiseGit has added a new property page for files/folders under Git " "control, where you can see all relevant information about the selected file/" "directory." msgstr "" "有时你可能想得到关于一个文件/目录的更多的细节信息而不仅是一个" -"重载的标志。 你能得到Subversion的属性对话框中浏览到的所有信息。只需选择指定文" +"重载的标志。 你能得到Git的属性对话框中浏览到的所有信息。只需选择指定文" "件或目录，然后在文件菜单中选择Windows Menuproperties(注意: 这是浏览器提" "供的标准属性菜单，而不是TortoiseGit 子菜单的其中之一)。在TortoiseGit 属性对话" -"框中已经为在Subversion控制下的文件/目录增加新的属性页。在这里你能看到所有的关" +"框中已经为在Git控制下的文件/目录增加新的属性页。在这里你能看到所有的关" "于选择文件/目录的相关信息。" #. (title) #: ../source/TortoiseGit_en.xml:7521 -msgid "Explorer property page, Subversion tab" -msgstr "资源管理器属性页，Subversion 页面" +msgid "Explorer property page, Git tab" +msgstr "资源管理器属性页，Git 页面" #. (title) #: ../source/TortoiseGit_en.xml:7541 -msgid "Subversion Properties" -msgstr "Subversion 属性" +msgid "Git Properties" +msgstr "Git 属性" #. (primary) #: ../source/TortoiseGit_en.xml:7543 -msgid "Subversion properties" -msgstr "Subversion 属性" +msgid "Git properties" +msgstr "Git 属性" #. (para) #: ../source/TortoiseGit_en.xml:7547 #, fuzzy msgid "" -" You can read and set the Subversion properties from the " +" You can read and set the Git properties from the " "Windows properties dialog, but also from TortoiseGitproperties and within " "TortoiseGit's status lists, from Context menuproperties." msgstr "" -" 你可以在 Windows 属性对话框读写 Subversion 属性。也可以从" +" 你可以在 Windows 属性对话框读写 Git 属性。也可以从" "TortoiseGit属性，或者 上下文菜单属性，来读写 Subversion 属性。" +"guimenuitem>，来读写 Git 属性。" #. (title) #: ../source/TortoiseGit_en.xml:7549 -msgid "Subversion property page" -msgstr "Subversion 属性页" +msgid "Git property page" +msgstr "Git 属性页" #. (para) #: ../source/TortoiseGit_en.xml:7564 #, fuzzy msgid "" "You can add your own properties, or some properties with a special meaning in " -"Subversion. These begin with svn:. svn:externalssvn:. svn:externals is such a property; see how to handle externals in ." msgstr "" -"从版本库里删除数据的唯一方法就是使用svnadmin这个Subversion" +"从版本库里删除数据的唯一方法就是使用svnadmin这个Git" "命令行工具。具体如何实现请参考《使用 Subversion 进行版本管理》《使用 Git 进行版本管理》。" #. (title) @@ -10831,11 +10831,11 @@ msgstr "展开关键字" #. (para) #: ../source/TortoiseGit_en.xml:7578 msgid "" -"Subversion supports CVS-like keyword expansion which can be used to embed " +"Git supports CVS-like keyword expansion which can be used to embed " "filename and revision information within the file itself. Keywords currently " "supported are: " msgstr "" -"Subversion 支持类似 CVS 的关键字扩展，用来在文件中嵌入文件名称和版本信息。当前" +"Git 支持类似 CVS 的关键字扩展，用来在文件中嵌入文件名称和版本信息。当前" "支持的关键字有：" #. (para) @@ -10874,11 +10874,11 @@ msgstr "前述四个关键字的压缩组合。" msgid "" "To find out how to use these keywords, look at the svn:keywords section in the Subversion " +"\">svn:keywords section in the Git " "book, which gives a full description of these keywords and how to enable and " "use them." msgstr "" -"关键字的用法参见 Subversion 手册的 svn:keywords section，它给出了这些关键字的完" "整描述和启用方法。" @@ -10887,12 +10887,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7639 #, fuzzy msgid "" -"For more information about properties in Subversion see the Special Properties." msgstr "" "更多的关于svnserve的信息可以看《使用 Subversion 进行版本管理》。" +"\">《使用 Git 进行版本管理》。" #. (title) #: ../source/TortoiseGit_en.xml:7646 @@ -10984,7 +10984,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7695 #, fuzzy msgid "Exporting and Importing Properties" -msgstr "导出一个Subversion工作副本" +msgstr "导出一个Git工作副本" #. (para) #: ../source/TortoiseGit_en.xml:7696 @@ -11076,7 +11076,7 @@ msgstr "auto-props" #: ../source/TortoiseGit_en.xml:7757 #, fuzzy msgid "" -"You can configure Subversion and TortoiseGit to set properties automatically " +"You can configure Git and TortoiseGit to set properties automatically " "on files and folders when they are added to the repository. There are two " "ways of doing this." msgstr "" @@ -11086,15 +11086,15 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:7762 msgid "" -"You can edit the subversion configuration file to enable this feature on your " +"You can edit the Git configuration file to enable this feature on your " "client. The General page of TortoiseGit's settings " "dialog has an edit button to take you there directly. The config file is a " -"simple text file which controls some of subversion's workings. You need to " +"simple text file which controls some of Git's workings. You need to " "change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. " "Secondly you need to edit the section below to define which properties you " -"want added to which file types. This method is a standard subversion feature " -"and works with any subversion client. However it has to be defined on each " +"want added to which file types. This method is a standard Git feature " +"and works with any Git client. However it has to be defined on each " "client individually - there is no way to propagate these settings from the " "repository." msgstr "" @@ -11132,9 +11132,9 @@ msgstr "提交属性" #. (para) #: ../source/TortoiseGit_en.xml:7799 msgid "" -"Subversion properties are versioned. After you change or add a property you " +"Git properties are versioned. After you change or add a property you " "have to commit your changes." -msgstr "Subversion 属性是受版本控制的。在你改变或增加属性后必须提交。" +msgstr "Git 属性是受版本控制的。在你改变或增加属性后必须提交。" #. (title) #: ../source/TortoiseGit_en.xml:7805 @@ -11145,10 +11145,10 @@ msgstr "属性冲突" #: ../source/TortoiseGit_en.xml:7806 msgid "" "If there's a conflict on committing the changes, because another user has " -"changed the same property, Subversion generates a .prej " +"changed the same property, Git generates a .prej " "file. Delete this file after you have resolved the conflict." msgstr "" -"如果因为其他用户已经提交了同样的属性，提交时出现冲突，Subversion 会产生一个 " +"如果因为其他用户已经提交了同样的属性，提交时出现冲突，Git 会产生一个 " ".prej 文件。在你解决冲突后，请删除此文件。" #. (title) @@ -11236,17 +11236,17 @@ msgstr "" #: ../source/TortoiseGit_en.xml:7871 #, fuzzy msgid "" -"Subversion allows you to set autoprops which will be applied " +"Git allows you to set autoprops which will be applied " "to newly added or imported files, based on the file extension. This depends " -"on every client having set appropriate autoprops in their subversion " +"on every client having set appropriate autoprops in their Git " "configuration file. tsvn:autoprops can be set on folders " "and these will be merged with the user's local autoprops when importing or " -"adding files. The format is the same as for subversion autoprops, e.g. " +"adding files. The format is the same as for Git autoprops, e.g. " "*.sh = svn:eol-style=native;svn:executable sets two " "properties on files with the .sh extension." msgstr "" -"Subversion 允许你设置 autoprops，它基于文件扩展名，对新增文件或" -"导入的文件生效。这依赖于每个客户端在 Subversion 配置文件中设置适当的 " +"Git 允许你设置 autoprops，它基于文件扩展名，对新增文件或" +"导入的文件生效。这依赖于每个客户端在 Git 配置文件中设置适当的 " "autoprops。tsvn:autoprops 可以对目录设置，当新增文件或导入" "文件时，它会与用户的本地 autoprops 合并。" @@ -11439,13 +11439,13 @@ msgstr "" msgid "" "Although TortoiseGit's project properties are extremely useful, they only " "work with TortoiseGit, and some will only work in newer versions of " -"TortoiseGit. If people working on your project use a variety of Subversion " +"TortoiseGit. If people working on your project use a variety of Git " "clients, or possibly have old versions of TortoiseGit, you may want to use " "repository hooks to enforce project policies. project properties can only " "help to implement a policy, they cannot enforce it." msgstr "" "尽管 tsvn:xxx 属性很有用，它们只适用于 TortoiseGit，而且一" -"些只是对于新版本的 TortoiseGit 才生效。如果你的项目中的人使用各种 Subversion " +"些只是对于新版本的 TortoiseGit 才生效。如果你的项目中的人使用各种 Git " "客户端，或者使用低版本的 TortoiseGit，你可能想使用版本库钩子强制执行项目政策。" "tsvn: 属性只能帮助你实现政策，不能强制执行。" @@ -11496,14 +11496,14 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8047 #, fuzzy msgid "" -"Subversion does not have special commands for branching or tagging, but uses " +"Git does not have special commands for branching or tagging, but uses " "so-called cheap copies instead. Cheap copies are similar to " "hard links in Unix, which means that instead of making a complete copy in the " "repository, an internal link is created, pointing to a specific tree/" "revision. As a result branches and tags are very quick to create, and take up " "almost no extra space in the repository." msgstr "" -"Subversion 没有用于建立分支和标记的特殊命令，但是使用所谓的便宜复制便宜复制来代替。便宜复制类似于Unix里的硬连接，它意思是代替一个版本库里的完整的" "复制，创建一个内部的连接，指向一个具体的版本树。结果分支和标记就迅速被创建，并" "且没有在版本库里占据任何额外的空间。" @@ -11753,10 +11753,10 @@ msgstr "切换对话框" #. (para) #: ../source/TortoiseGit_en.xml:8234 msgid "" -"Although Subversion itself makes no distinction between tags and branches, " +"Although Git itself makes no distinction between tags and branches, " "the way they are typically used differs a bit. " msgstr "" -"尽管Subversion本身不区分标记和分支，它们的使用方法还是有些不同。" #. (para) @@ -11830,15 +11830,15 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8288 #, fuzzy msgid "" -"It is important to understand how branching and merging works in Subversion " +"It is important to understand how branching and merging works in Git " "before you start using it, as it can become quite complex. It is highly " "recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and " +"citetitle> in the Git book, which gives a full description and " "many examples of how it is used." msgstr "" "因为分支与合并很复杂，所以在你开始使用之前，请先理解它是怎么工作的。强烈建议你" -"阅读《使用 Subversion 进行版本管理》的分支与合并章" "节，它给出了全面的描述，和许多使用举例。" @@ -11894,7 +11894,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8331 msgid "" -"What you are asking Subversion to do is this: Calculate the changes " +"What you are asking Git to do is this: Calculate the changes " "necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, " "and apply those changes to my working copy (of trunk or branch B)." msgstr "" @@ -11910,13 +11910,13 @@ msgstr "复兴分支" #, fuzzy msgid "" "This method covers the case when you have made a feature branch as discussed " -"in the Subversion book. All trunk changes have been ported to the feature " +"in the Git book. All trunk changes have been ported to the feature " "branch, week by week, and now the feature is complete you want to merge it " "back into the trunk. Because you have kept the feature branch synchronized " "with the trunk, the latest versions of branch and trunk will be absolutely " "identical except for your branch changes." msgstr "" -"这个用例覆盖了这种情况，当你象《Subversion手册》里讨论的那样，创建了一个新特性" +"这个用例覆盖了这种情况，当你象《Git手册》里讨论的那样，创建了一个新特性" "分支。所有最新版本的修改都要每周一次合并到新特性分支，等新特性完成后，你向将它" "合并到最新版本。因为你已经保持了新特性分支和最新版本同步，所以除了你在分支做的" "修改，其它部分在分支和最新版本应该是相同的。于是在这种情况下，你应当用比较分支" @@ -11927,7 +11927,7 @@ msgstr "" msgid "" "This is a special case of the tree merge described below, and it requires " "only the URL to merge from (normally) your development branch. It uses the " -"merge-tracking features of Subversion to calculate the correct revision " +"merge-tracking features of Git to calculate the correct revision " "ranges to use, and perform additional checks which ensure that the branch has " "been fully updated with trunk changes. This ensures that you don't " "accidentally undo work that others have committed to trunk since you last " @@ -11962,7 +11962,7 @@ msgstr "合并两个不同的树" #: ../source/TortoiseGit_en.xml:8381 msgid "" "This is a more general case of the reintegrate method. What you are asking " -"Subversion to do is: Calculate the changes necessary to get [FROM] the " +"Git to do is: Calculate the changes necessary to get [FROM] the " "head revision of the trunk [TO] the head revision of the branch, and apply " "those changes to my working copy (of the trunk). The net result is " "that trunk now looks exactly like the branch." @@ -11976,7 +11976,7 @@ msgid "" "are using vendor branches and you need to merge the changes following a new " "vendor drop into your trunk code. For more information read the chapter on " "vendor branches in the Subversion Book." +"\">vendor branches in the Git Book." msgstr "" #. (title) @@ -12046,7 +12046,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8452 msgid "" -"If you are merging revisions in chunks, the method shown in the subversion " +"If you are merging revisions in chunks, the method shown in the Git " "book will have you merge 100-200 this time and 200-300 next time. With " "TortoiseGit you would merge 100-200 this time and 201-300 next time." msgstr "" @@ -12108,8 +12108,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:8497 msgid "" -"If you are using the merge tracking features of Subversion, you do not need " -"to remember which revisions have already been merged - Subversion will record " +"If you are using the merge tracking features of Git, you do not need " +"to remember which revisions have already been merged - Git will record " "that for you. If you leave the revision range blank, all revisions which have " "not yet been merged will be included. Read to find out more." @@ -12275,22 +12275,22 @@ msgid "" "that changes relative to a common ancestor are merged. Sometimes you may need " "to merge files which are perhaps related, but not in your repository. For " "example you may have imported versions 1 and 2 of a third party library into " -"two separate directories. Although they are logically related, Subversion has " +"two separate directories. Although they are logically related, Git has " "no knowledge of this because it only sees the tarballs you imported. If you " "attempt to merge the difference between these two trees you would see a " -"complete removal followed by a complete add. To make Subversion use only path-" +"complete removal followed by a complete add. To make Git use only path-" "based differences rather than history-based differences, check the " "Ignore ancestry box. Read more about this topic in the " -"Subversion book, Noticing or Ignoring Ancestry" msgstr "" "大部分时候，你要合并文件的历史，所以要相对于公共祖先合并。有时你需要合并或许是" "有关系的文件，但是不在你的版本库中。例如，你已经将一个第三方库的版本1和2导入到" -"两个单独目录。尽管它们逻辑相关，因为Subversion只看到你导入的文件，所以它不知道" -"这些关系。如果你试图合并这两个树的修改，将会看到完全的删除和增加。让Subversion" +"两个单独目录。尽管它们逻辑相关，因为Git只看到你导入的文件，所以它不知道" +"这些关系。如果你试图合并这两个树的修改，将会看到完全的删除和增加。让Git" "只使用路径差异，不关心历史差异，选中忽略祖先检查框。你可" -"以在《使用 Subversion 进行版本管理》的关心或忽略祖先中阅读此主题的更多信息。" @@ -12360,7 +12360,7 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8668 #, fuzzy msgid "" -"For Subversion clients and servers prior to 1.5, no merge information is " +"For Git clients and servers prior to 1.5, no merge information is " "stored and merged revisions have to be tracked manually. When you have tested " "the changes and come to commit this revision, your commit log message should " "always include the revision numbers which have been " @@ -12369,25 +12369,25 @@ msgid "" "change more than once. For more information about this, refer to Best Practices for Merging in the Subversion book." +"citetitle> in the Git book." msgstr "" "当你已经测试了修改，准备提交时，日志信息应当总是包含这次" "合并的版本信息。如果你以后需要执行合并，就需要知道已经合并了什么，因为你不想多" -"次合并同一修改。不幸的是，合并信息不会存储在Subversion版本库中。阅读《使用 " -"Subversion 进行版本管理》中的合并的最佳实践章节以获得更多信息。" #. (para) #: ../source/TortoiseGit_en.xml:8685 msgid "" -"If your server and all clients are running Subversion 1.5 or higher, the " +"If your server and all clients are running Git 1.5 or higher, the " "merge tracking facility will record the revisions merged and avoid a revision " "being merged more than once. This makes your life much simpler as you can " "simply merge the entire revision range each time and know that only new " "revisions will actually be merged." msgstr "" -"如果你的服务器和所有客户端都使用 Subversion 1.5 或更高版本，合并跟踪工具会记录" +"如果你的服务器和所有客户端都使用 Git 1.5 或更高版本，合并跟踪工具会记录" "已经合并的版本，避免某个版本被合并多次。它会使你的生活更简单，因为你每次都可以" "简单的合并全部版本范围，并且知道只有新版本才会实际被合并。" @@ -12417,13 +12417,13 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8707 #, fuzzy msgid "" -"Subversion can't merge a file with a folder and vice versa - only folders to " +"Git can't merge a file with a folder and vice versa - only folders to " "folders and files to files. If you click on a file and open up the merge " "dialog, then you have to give a path to a file in that dialog. If you select " "a folder and bring up the dialog, then you must specify a folder URL for the " "merge." msgstr "" -"Subversion不能进行文件与文件夹的合并，反之亦然 - 只能文件夹对文件夹，文件对文" +"Git不能进行文件与文件夹的合并，反之亦然 - 只能文件夹对文件夹，文件对文" "件。如果选择了文件，打开合并对话框，那么你必须在对话框中给出文件的路径。如果你" "选择了文件夹，打开合并对话框，那么你必须给出文件夹的对话框。" @@ -12440,12 +12440,12 @@ msgstr "合并跟踪" #. (para) #: ../source/TortoiseGit_en.xml:8721 msgid "" -"Subversion 1.5 introduced facilities for merge tracking. When you merge " +"Git 1.5 introduced facilities for merge tracking. When you merge " "changes from one tree into another, the revision numbers merged are stored " "and this information can be used for several different purposes. " msgstr "" -"Subversion 1.5 引入了合并跟踪特性。当你合并版本树时，版本号会被保存，此信息可" +"Git 1.5 引入了合并跟踪特性。当你合并版本树时，版本号会被保存，此信息可" "以用于几个目的。" #. (para) @@ -12502,13 +12502,13 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8773 #, fuzzy msgid "" -"Find out more about merge tracking from Subversion's Merge tracking " +"Find out more about merge tracking from Git's Merge tracking " "documentation." msgstr "" -"从http://subversion.tigris.org/servlets/" -"ProjectDocumentList?folderID=91下载最新版本的Subversion。" +"从http://Git.tigris.org/servlets/" +"ProjectDocumentList?folderID=91下载最新版本的Git。" #. (title) #: ../source/TortoiseGit_en.xml:8781 @@ -12672,13 +12672,13 @@ msgstr "只读" #. (para) #: ../source/TortoiseGit_en.xml:8907 msgid "" -"Subversion generally works best without locking, using the Copy-Modify-" +"Git generally works best without locking, using the Copy-Modify-" "Merge methods described earlier in . However there are a few instances when you " "may need to implement some form of locking policy. " msgstr "" "使用之前在中描述的" -"复制-修改-合并 的方法，Subversion通常不需要锁就可以很好的工作。" +"复制-修改-合并 的方法，Git通常不需要锁就可以很好的工作。" "但是，在某些情况下你可能需要制定某种锁定策略。" #. (para) @@ -12704,18 +12704,18 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8931 #, fuzzy msgid "" -"Firstly you need to ensure that your Subversion server is upgraded to at " +"Firstly you need to ensure that your Git server is upgraded to at " "least version 1.2. Earlier versions do not support locking at all. If you are " "using file:// access, then of course only your client " "needs to be updated." msgstr "" -"首先，你需要确保你的Subversion服务器更新到至少1.2版本。早期的版本不支持锁定。" +"首先，你需要确保你的Git服务器更新到至少1.2版本。早期的版本不支持锁定。" "如果你使用file:///进行访问，那么当然只要更新你的客户端就" "可以了。" #. (title) #: ../source/TortoiseGit_en.xml:8938 -msgid "How Locking Works in Subversion" +msgid "How Locking Works in Git" msgstr "锁定在Subverion中是如何工作的" #. (para) @@ -12746,7 +12746,7 @@ msgid "" "However, other users will not necessarily know that you have taken out a " "lock. Unless they check the lock status regularly, the first they will know " "about it is when their commit fails, which in most cases is not very useful. " -"To make it easier to manage locks, there is a new Subversion property " +"To make it easier to manage locks, there is a new Git property " "svn:needs-lock. When this property is set (to any value) " "on a file, whenever the file is checked out or updated, the local copy is " "made read-only unless that working copy holds a lock for " @@ -12757,7 +12757,7 @@ msgid "" msgstr "" "但是，其他用户不必知道你已经增加了锁定，除非他们定期地检查锁定的状态。这其实没" "什么意义，因为他们发现提交失败的时候就可以知道锁定了。为了更容易管理锁，而设置" -"了一个新的Subversion属性 svn:needs-lock。当一个文件的这个属" +"了一个新的Git属性 svn:needs-lock。当一个文件的这个属" "性被设置(成任意值)的时候，每当该文件检出或更新时，本地的副本都被设成只读，" "除非该工作副本就是拥有锁的那个用户的。这么做是为了能警告" "你，你不应该修改这个文件，除非你申请到了锁定。受控只读的文件在TortoiseGit中用" @@ -12777,14 +12777,14 @@ msgstr "" #: ../source/TortoiseGit_en.xml:8974 msgid "" "If one of your co-workers acquires a lock and then goes on holiday without " -"releasing it, what do you do? Subversion provides a means to force locks. " +"releasing it, what do you do? Git provides a means to force locks. " "Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already " "holds is referred to as Stealing the lock. Naturally " "these are not things you should do lightly if you want to remain friends with " "your co-workers." msgstr "" -"如果你的合作者之一请求一个锁，但却外出旅游去了，你怎么办？Subversion提供了一种" +"如果你的合作者之一请求一个锁，但却外出旅游去了，你怎么办？Git提供了一种" "强制锁。释放别人拥有的锁被称为破坏锁定，强制获得别人拥" "有的锁称为窃取锁定。当然，如果你想要与你的合作者保持良" "好的关系，轻易不要这么做。" @@ -12928,12 +12928,12 @@ msgid "" "If you break or steal someone else's lock without telling them, you could " "potentially cause loss of work. If you are working with unmergeable file " "types and you steal someone else's lock, once you release the lock they are " -"free to check in their changes and overwrite yours. Subversion doesn't lose " +"free to check in their changes and overwrite yours. Git doesn't lose " "data, but you have lost the team-working protection that locking gave you." msgstr "" "如果你在破坏或是窃取某人的锁的时候没有告诉他，你可能会丢掉工作。如果你正在写一" "个不可合并的文件类型，并且你窃取了某人的锁，一旦你释放了锁，他们就可以随意检入" -"他们的修改以覆盖你的。Subversion并不会丢弃数据，但你却失去了锁带来的对团队工作" +"他们的修改以覆盖你的。Git并不会丢弃数据，但你却失去了锁带来的对团队工作" "的保护。" #. (title) @@ -12963,11 +12963,11 @@ msgstr "" #, fuzzy msgid "" "If you operate a policy where every file has to be locked then you may find " -"it easier to use Subversion's auto-props feature to set the property " +"it easier to use Git's auto-props feature to set the property " "automatically every time you add new files. Read for further information." msgstr "" -"如果你管理的策略要求每个文件都必须被锁定，那么你会发现使用Subversion的auto-" +"如果你管理的策略要求每个文件都必须被锁定，那么你会发现使用Git的auto-" "props功能，在你每次加入新文件的时候，自动设置属性是很方便的。请阅读。" @@ -12979,7 +12979,7 @@ msgstr "锁定钩子脚本" #. (para) #: ../source/TortoiseGit_en.xml:9108 msgid "" -"When you create a new repository with Subversion 1.2 or higher, four hook " +"When you create a new repository with Git 1.2 or higher, four hook " "templates are created in the repository hooks directory. " "These are called before and after getting a lock, and before and after " "releasing a lock." @@ -14187,12 +14187,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:9956 msgid "" -"Because Subversion cannot provide all the information required, a certain " +"Because Git cannot provide all the information required, a certain " "amount of interpretation is required, which can sometimes give strange " "results. Nevertheless, the output for the trunk will generally give useful " "results." msgstr "" -"因为Subversion不能支持提供所有请求的信息，在有大量请求信息时，有时它能提供强大" +"因为Git不能支持提供所有请求的信息，在有大量请求信息时，有时它能提供强大" "的返回信息。但无论如何，主干都会产生有用的输出。" #. (para) @@ -14217,8 +14217,8 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:9985 -msgid "Exporting a Subversion Working Copy" -msgstr "导出一个Subversion工作副本" +msgid "Exporting a Git Working Copy" +msgstr "导出一个Git工作副本" #. (primary) #: ../source/TortoiseGit_en.xml:9987 @@ -14330,13 +14330,13 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10059 #, fuzzy msgid "Exporting single files" -msgstr "导出一个Subversion工作副本" +msgstr "导出一个Git工作副本" #. (para) #: ../source/TortoiseGit_en.xml:10060 msgid "" "The export dialog does not allow exporting single files, even though " -"Subversion can." +"Git can." msgstr "" #. (para) @@ -14469,7 +14469,7 @@ msgstr "以下情况不支持: " #. (para) #: ../source/TortoiseGit_en.xml:10154 msgid "" -"You want to move to a different Subversion repository. In that case you " +"You want to move to a different Git repository. In that case you " "should perform a clean checkout from the new repository location." msgstr "" "你要移到一个完全不同的版本库。这种情况下，你必须从新的版本库里执行一次干净的检" @@ -14529,7 +14529,7 @@ msgstr "BUG 跟踪器" msgid "" "It is very common in Software Development for changes to be related to a " "specific bug or issue ID. Users of bug tracking systems (issue trackers) " -"would like to associate the changes they make in Subversion with a specific " +"would like to associate the changes they make in Git with a specific " "ID in their issue tracker. Most issue trackers therefore provide a pre-commit " "hook script which parses the log message to find the bug ID with which the " "commit is associated. This is somewhat error prone since it relies on the " @@ -14537,7 +14537,7 @@ msgid "" "parse it correctly." msgstr "" "在软件开发中，修改依赖于一个bug或问题编号是很常见的。bug跟踪系统的用户(问题跟" -"踪者)喜欢在问题跟踪中将Subversion的修改与一个指定编号联系起来。因此很多问题跟" +"踪者)喜欢在问题跟踪中将Git的修改与一个指定编号联系起来。因此很多问题跟" "踪者提供了一个预提交钩子脚本，分析日志，查找提交相关的bug编号。这稍微有些不可" "靠，因为它依赖于用户写完全的日志，预提交钩子才能正确分析。" @@ -14925,13 +14925,13 @@ msgstr "" #, fuzzy msgid "" "This issue tracker integration is not restricted to TortoiseGit; it can be " -"used with any Subversion client. For more information, read the full Issue Tracker Integration Specification " "in the TortoiseGit source repository. ( explains how to access the repository)." msgstr "" -"问题追踪集成并没有限制在TortoiseGit，可以用于所有的Subversion客户端，更多信息" +"问题追踪集成并没有限制在TortoiseGit，可以用于所有的Git客户端，更多信息" "可以看Issuetracker Integration Specification。" @@ -15006,7 +15006,7 @@ msgstr "ViewCS" #: ../source/TortoiseGit_en.xml:10559 msgid "" "There are several web-based repository viewers available for use with " -"Subversion such as ViewVCViewVC and WebSVN. TortoiseGit provides a means to " "link with these viewers." @@ -15109,10 +15109,10 @@ msgstr "声音" #: ../source/TortoiseGit_en.xml:10672 msgid "" " This dialog allows you to specify your preferred language, " -"and the Subversion-specific settings." +"and the Git-specific settings." msgstr "" " 这个对话框允许你指定自己喜欢的语言，同时也可做那些与" -"Subversion相关的特殊设置。" +"Git相关的特殊设置。" #. (title) #: ../source/TortoiseGit_en.xml:10674 @@ -15218,21 +15218,21 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10754 msgid "" "Note that the ignore patterns you specify here will also affect other " -"Subversion clients running on your PC, including the command line client." +"Git clients running on your PC, including the command line client." msgstr "" -"值得注意的是，你在这里指定的忽略样式将同样作用于你本机上的其他Subversion客户" +"值得注意的是，你在这里指定的忽略样式将同样作用于你本机上的其他Git客户" "端，包括命令行客户端。" #. (para) #: ../source/TortoiseGit_en.xml:10760 msgid "" -"If you use the Subversion configuration file to set a global-" +"If you use the Git configuration file to set a global-" "ignores pattern, it will override the settings you make here. The " -"Subversion configuration file is accessed using the EditEdit as described below." msgstr "" -"如果你象下面段落那样使用Subversion配置文件来设置一个 全局－忽略 样式，那么它将覆盖你在这里做的设置。该Subversion配置文件可以象下面段" +"如果你象下面段落那样使用Git配置文件来设置一个 全局－忽略 样式，那么它将覆盖你在这里做的设置。该Git配置文件可以象下面段" "落描述的那样，通过 编辑 按钮来访问。" #. (para) @@ -15274,35 +15274,35 @@ msgstr "" #. (term) #: ../source/TortoiseGit_en.xml:10796 -msgid "Subversion configuration file" -msgstr "Subversion配置文件" +msgid "Git configuration file" +msgstr "Git配置文件" #. (para) #: ../source/TortoiseGit_en.xml:10798 #, fuzzy msgid "" -"Use Edit to edit the Subversion configuration file " +"Use Edit to edit the Git configuration file " "directly. Some settings cannot be modified directly by TortoiseGit, and need " -"to be set here instead. For more information about the Subversion " +"to be set here instead. For more information about the Git " "config file see the Runtime Configuration " "Area. The section on Automatic Property Setting is of particular " -"interest, and that is configured here. Note that Subversion can read " +"interest, and that is configured here. Note that Git can read " "configuration information from several places, and you need to know which one " "takes priority. Refer to Configuration and the Windows Registry to " "find out more." msgstr "" -"使用 编辑 按钮来直接编译Subversion配置文件。有些设置不" +"使用 编辑 按钮来直接编译Git配置文件。有些设置不" "能被TSVN直接修改，就需要在这里完成。可以阅读 运行时配置 " -"来获得有关Subversion 配置 文件的更多信息。在 配置 文件的更多信息。在 设置" "自动属性 中的章节介绍了可以在这里配置的特殊偏好部分。值得" -"注意的是，Subversion可以从许多不同的位置读取配置信息，因此你也就需要了解哪一个" +"注意的是，Git可以从许多不同的位置读取配置信息，因此你也就需要了解哪一个" "将优先起作用。阅读 配置与Windows注册表 来获取更多" "信息。" @@ -15319,23 +15319,23 @@ msgstr "" #: ../source/TortoiseGit_en.xml:10825 msgid "" "VS.NET when used with web projects can't handle the .svn " -"folders that Subversion uses to store its internal information. This is not a " -"bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. " +"folders that Git uses to store its internal information. This is not a " +"bug in Git. The bug is in VS.NET and the frontpage extensions it uses. " "Read to find out more about " "this issue." msgstr "" "在使用VS.NET环境做web工程时，将无法处理 .svn 文件夹，但" -"Subversion是要用这些文件夹来储存自己的内部信息的。这可不是Subversion的bug，这" +"Git是要用这些文件夹来储存自己的内部信息的。这可不是Git的bug，这" "bug是VS.NET和它使用的frontpage扩展带来的。阅读 来获得有关此问题的更多信息。" #. (para) #: ../source/TortoiseGit_en.xml:10832 msgid "" -"If you want to change the behaviour of Subversion and TortoiseGit, you can " +"If you want to change the behaviour of Git and TortoiseGit, you can " "use this checkbox to set the environment variable which controls this." msgstr "" -"若你想改变Subversion和TSVN的这些行为，就可以使用这个选项框来设置控制这些的环境" +"若你想改变Git和TSVN的这些行为，就可以使用这个选项框来设置控制这些的环境" "变量。" #. (para) @@ -15517,12 +15517,12 @@ msgstr "" msgid "" "Auto-close if no errors always closes the dialog even if " "there were conflicts. The only condition that keeps the dialog open is an " -"error condition, which occurs when Subversion is unable to complete the task. " +"error condition, which occurs when Git is unable to complete the task. " "For example, an update fails because the server is inaccessible, or a commit " "fails because the working copy is out-of-date." msgstr "" "如无错误，自动关闭 即使在有冲突发生时也会关闭。维持对话框" -"打开的唯一条件是发生了错误，使得Subversion无法完成任务。举个例子，一个更新操作" +"打开的唯一条件是发生了错误，使得Git无法完成任务。举个例子，一个更新操作" "由于服务器不可达而失败了，或是一个提交操作因为工作副本已经过期而失败。" #. (term) @@ -16122,24 +16122,24 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11369 msgid "" -"f:\\development\\SVN\\Subversion will disable the " +"f:\\development\\SVN\\Git will disable the " "overlays only on that specific folder. You still can see " "the overlays on all files and folder inside that folder." msgstr "" -"填写 f:\\development\\SVN\\Subversion 将 仅仅f:\\development\\SVN\\Git 将 仅仅 在这个特殊文件夹上取消图标覆盖。 你仍然可以在该路径下的所有文件、文" "件夹上看到图标重载。" #. (para) #: ../source/TortoiseGit_en.xml:11374 msgid "" -"f:\\development\\SVN\\Subversion* will disable the " +"f:\\development\\SVN\\Git* will disable the " "overlays on all files and folders whose path starts with " -"f:\\development\\SVN\\Subversion. That means you won't " +"f:\\development\\SVN\\Git. That means you won't " "see overlays for any files and folders below that path." msgstr "" -"填写 f:\\development\\SVN\\Subversion* 将在路径以 " -"f:\\development\\SVN\\Subversion 开始的 所有f:\\development\\SVN\\Git* 将在路径以 " +"f:\\development\\SVN\\Git 开始的 所有 文件和文件夹上取消图标重载。这意味着你在该路径下的任何文件/文件夹上" "都将看不到图标重载了。" @@ -16287,13 +16287,13 @@ msgstr "设置对话框，网络设置页面" #, fuzzy msgid "" "If you need to set up per-repository proxy settings, you will need to use the " -"Subversion servers file to configure this. Use " +"Git servers file to configure this. Use " "Edit to get there directly. Consult the Runtime Configuration Area for details on " "how to use this file." msgstr "" -"如果你需要对每个版本库建立一套代理设置，你必须使用Subversion服务器服务器文件来配置。使用编辑来直接访问该配置文件" "(servers.txt)。该文件的细节和使用方法可以参考运行时配置" @@ -16358,7 +16358,7 @@ msgid "" "Finally, setting up SSH on server and clients is a non-trivial process which " "is beyond the scope of this help file. However, you can find a guide in the " "TortoiseGit FAQ listed under Subversion/TortoiseGit SSH How-To." +"\">Git/TortoiseGit SSH How-To." msgstr "" #. (title) @@ -16503,11 +16503,11 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:11637 msgid "" -"You can also specify a different diff tool to use on Subversion properties. " +"You can also specify a different diff tool to use on Git properties. " "Since these tend to be short simple text strings, you may want to use a " "simpler more compact viewer." msgstr "" -"你也可以使用 Subversion 属性来指定其它的比较工具。既然这些是简短的文本，你可能" +"你也可以使用 Git 属性来指定其它的比较工具。既然这些是简短的文本，你可能" "想要使用简单的查看器。" #. (para) @@ -16765,12 +16765,12 @@ msgstr "认证数据" #. (para) #: ../source/TortoiseGit_en.xml:11870 msgid "" -"When you authenticate with a Subversion server, the username and password are " +"When you authenticate with a Git server, the username and password are " "cached locally so you don't have to keep entering them. You may want to clear " "this for security reasons, or because you want to access the repository under " "a different username ... does John know you are using his PC?" msgstr "" -"当你在登陆某个Subversion服务器，填写认证信息时，用户名和密码也可以被保存在本" +"当你在登陆某个Git服务器，填写认证信息时，用户名和密码也可以被保存在本" "地，你也就不用每次都输入了。但考虑到一些安全因素，你可能会有清除这些认证信息的" "愿望，或者你仅仅是想换个不同的用户名登陆...John知道你正在用他的机器么？(规范点" "儿，用你自己的用户名登陆版本库吧，伙计 *by Jax)" @@ -17071,11 +17071,11 @@ msgstr "客户端钩子" #: ../source/TortoiseGit_en.xml:12111 msgid "" " This dialog allows you to set up hook scripts which will be " -"executed automatically when certain Subversion actions are performed. As " +"executed automatically when certain Git actions are performed. As " "opposed to the hook scripts explained in , these scripts are executed locally on the client." msgstr "" -" 这个对话框允许你指定当特定 Subversion 动作执行时，自动执行的" +" 这个对话框允许你指定当特定 Git 动作执行时，自动执行的" "钩子脚本。与 中说明的钩子脚本相反，" "这些脚本在客户端本地执行。" @@ -17184,8 +17184,8 @@ msgstr "更新之前" #. (para) #: ../source/TortoiseGit_en.xml:12182 -msgid "Called before the actual Subversion update begins." -msgstr "在 Subversion 更新实际开始之前调用" +msgid "Called before the actual Git update begins." +msgstr "在 Git 更新实际开始之前调用" #. (term) #. (term) @@ -17329,10 +17329,10 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:12360 msgid "" -"If you want the Subversion operation to hold off until the hook has " +"If you want the Git operation to hold off until the hook has " "completed, check Wait for the script to finish." msgstr "" -"如果你想Subversion 操作直到钩子完成才结束，就选择等待脚本结束等待脚本结束。" #. (para) @@ -17491,12 +17491,12 @@ msgstr "一些极不常用的设置只有通过直接修改注册表的方式才 #. (para) #: ../source/TortoiseGit_en.xml:12487 msgid "" -"You can specify a different location for the Subversion configuration file " +"You can specify a different location for the Git configuration file " "using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." msgstr "" "通过编辑注册表 HKCU\\Software\\TortoiseGit\\ConfigDir，你可" -"以为Subversion的配置文件指定一个不同位置。这将影响到TSVN的所有操作。" +"以为Git的配置文件指定一个不同位置。这将影响到TSVN的所有操作。" #. (term) #: ../source/TortoiseGit_en.xml:12496 @@ -17596,8 +17596,8 @@ msgstr "" #. (title) #: ../source/TortoiseGit_en.xml:12577 -msgid "Subversion Working Folders" -msgstr "Subversion 的工作文件夹" +msgid "Git Working Folders" +msgstr "Git 的工作文件夹" #. (primary) #: ../source/TortoiseGit_en.xml:12579 @@ -17614,12 +17614,12 @@ msgstr "名为 _svn 的文件夹" #, fuzzy msgid "" "VS.NET 2003 when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This " -"is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage " +"literal> folders that Git uses to store its internal information. This " +"is not a bug in Git. The bug is in VS.NET 2003 and the frontpage " "extensions it uses." msgstr "" -"在使用VS.NET环境做web工程时，遇到.svn文件夹会出问题，但Subversion是要用这些文" -"件夹来储存自己的内部信息的。这可不是Subversion的bug，这bug是VS.NET和它使用的" +"在使用VS.NET环境做web工程时，遇到.svn文件夹会出问题，但Git是要用这些文" +"件夹来储存自己的内部信息的。这可不是Git的bug，这bug是VS.NET和它使用的" "frontpage扩展带来的。" #. (para) @@ -17631,16 +17631,16 @@ msgstr "" #: ../source/TortoiseGit_en.xml:12595 #, fuzzy msgid "" -"As of Version 1.3.0 of Subversion and TortoiseGit, you can set the " +"As of Version 1.3.0 of Git and TortoiseGit, you can set the " "environment variable SVN_ASP_DOT_NET_HACK. If that " -"variable is set, then Subversion will use _svn folders " +"variable is set, then Git will use _svn folders " "instead of .svn folders. You must restart your shell for " "that environment variable to take effect. Normally that means rebooting your " "PC. To make this easier, you can now do this from the general settings page " "using a simple checkbox - refer to ." msgstr "" -"在Subversion 1.3.0和TSVN 1.3.0里，你可以设置环境变量 " -"SVN_ASP_DOT_NET_HACK，来通知Subversion用 _svnSVN_ASP_DOT_NET_HACK，来通知Git用 _svn 文件夹替代 .svn 文件夹。你必须重启你系统的外壳程序" "来使环境变量生效，一般意味着你要重启PC。在1.4.0里这项替代工作就变得非常简单，" "你只需从常规设置页面选择一个单选框: 使用“_svn”目录替代“.svn”目录。——参考 " @@ -17722,19 +17722,19 @@ msgstr "COM" #: ../source/TortoiseGit_en.xml:12653 #, fuzzy msgid "version number in files" -msgstr "Subversion配置文件" +msgstr "Git配置文件" #. (para) #: ../source/TortoiseGit_en.xml:12656 msgid "" "SubWCRev is Windows console program which can be used to read the status of a " -"Subversion working copy and optionally perform keyword substitution in a " +"Git working copy and optionally perform keyword substitution in a " "template file. This is often used as part of the build process as a means of " "incorporating working copy information into the object you are building. " "Typically it might be used to include the revision number in an About box." msgstr "" -"SubWCRev是Windows的命令行工具，可以阅读Subversion工作副本的状态，可以在模版中" +"SubWCRev是Windows的命令行工具，可以阅读Git工作副本的状态，可以在模版中" "随意执行关键字替换。这通常是构建过程的一部分，将工作副本信息结合到创建的对象当" "中。通常情况下，可能是用来将修订版本号存入关于窗口。" @@ -17746,7 +17746,7 @@ msgstr "SubWCRev 命令行" #. (para) #: ../source/TortoiseGit_en.xml:12671 msgid "" -"SubWCRev reads the Subversion status of all files in a working copy, " +"SubWCRev reads the Git status of all files in a working copy, " "excluding externals by default. It records the highest commit revision number " "found, and the commit timestamp of that revision, It also records whether " "there are local modifications in the working copy, or mixed update revisions. " @@ -18248,12 +18248,12 @@ msgstr "SubWCRev 的 COM 接口" #. (para) #: ../source/TortoiseGit_en.xml:12995 msgid "" -"If you need to access Subversion revision information from other programs, " +"If you need to access Git revision information from other programs, " "you can use the COM interface of SubWCRev. The object to create is " "SubWCRev.object, and the following methods are supported: " "" msgstr "" -"如果你需要在其它程序中访问 Subversion 版本信息，可以使用 SubWCRev 的 COM 接" +"如果你需要在其它程序中访问 Git 版本信息，可以使用 SubWCRev 的 COM 接" "口。创建的对象名称是 SubWCRev.object，支持下述方法：" "" @@ -18573,13 +18573,13 @@ msgid "" "keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on " -"the TortoiseGit mailing lists dev@TortoiseGit.tigris.org and " -"users@TortoiseGit.tigris.org." +"the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and " +"tortoisegit-users@googlegroups.com ." msgstr "" "因为TortoiseGit一直处于开发状态，所以有时很难保持文档完全是最新的。我们在" "维护了一份交互式的在线" "FAQ。那里面包括了TortoiseGit邮件列表" -"dev@TortoiseGit.tigris.org里最常被问到的问题。" +"tortoisegit-dev@googlegroups.com 里最常被问到的问题。" #. (para) #: ../source/TortoiseGit_en.xml:13209 @@ -18600,10 +18600,10 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13219 msgid "" "If you have a question which is not answered anywhere else, the best place to " -"ask it is on one of the mailing lists. users@TortoiseGit.tigris.orgtortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If " "you want to help out with the development of TortoiseGit, then you should " -"take part in discussions on dev@TortoiseGit.tigris.org." +"take part in discussions on tortoisegit-dev@googlegroups.com ." msgstr "" #. (title) @@ -18689,11 +18689,11 @@ msgstr "空信息" #: ../source/TortoiseGit_en.xml:13295 msgid "" "There are two ways to prevent users from committing with an empty log " -"message. One is specific to TortoiseGit, the other works for all Subversion " +"message. One is specific to TortoiseGit, the other works for all Git " "clients, but requires access to the server directly." msgstr "" "有两种方法可以防止用户在不写日志的情况下进行提交操作。一种方式只对TortoiseGit" -"有效，另外一种方法对任何Subversion的客户端都有效，但是需要直接访问服务器。" +"有效，另外一种方法对任何Git的客户端都有效，但是需要直接访问服务器。" #. (title) #: ../source/TortoiseGit_en.xml:13301 @@ -18729,14 +18729,14 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:13317 msgid "" -"This method is the recommended way if your users also use other Subversion " +"This method is the recommended way if your users also use other Git " "clients than TortoiseGit. The drawback is that the commit is rejected by the " "server and therefore users will get an error message. The client can't know " "before the commit that it will be rejected. If you want to make TortoiseGit " "have the OK button disabled until the log message is " "long enough then please use the method described below." msgstr "" -"除了TortoiseGit，如果还要同时使用其他的Subversion客户端，推荐使用这种方法。缺" +"除了TortoiseGit，如果还要同时使用其他的Git客户端，推荐使用这种方法。缺" "点是提交是被服务器端拒绝的，因此用户会看到一个错误消息。客户端无法在提交之前就" "知道会被拒绝。如果希望在日志的内容达到足够长之前，TortoiseGit 的 " "OK 按钮处于无效的状态，请使用下面的方法。" @@ -18998,12 +18998,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13518 #, fuzzy msgid "" -"The only way to remove data from the repository is to use the Subversion " +"The only way to remove data from the repository is to use the Git " "command line tool svnadmin. You can find a description of " "how this works in the Repository Maintenance." msgstr "" -"从版本库里删除数据的唯一方法就是使用svnadmin这个Subversion" +"从版本库里删除数据的唯一方法就是使用svnadmin这个Git" "命令行工具。具体如何实现请参考版本库维护。" @@ -19124,12 +19124,12 @@ msgstr "" #: ../source/TortoiseGit_en.xml:13612 #, fuzzy msgid "" -"Commit the new folder. Now when you update, Subversion will pull a copy of " +"Commit the new folder. Now when you update, Git will pull a copy of " "that project from its repository into your working copy. The sub-folders will " "be created automatically if required. Each time you update your main working " "copy, you will also receive the latest version of all external projects." msgstr "" -"提交新的目录，然后当你更新时，Subversion会将那个项目的一个副本从它的版本库检出" +"提交新的目录，然后当你更新时，Git会将那个项目的一个副本从它的版本库检出" "到工作目录，如果需要，子目录会自动创建，每当你更新你的工作副本，你会得到所有外" "部项目的最新版本。" @@ -19152,8 +19152,8 @@ msgstr "使用嵌套工作副本" #: ../source/TortoiseGit_en.xml:13640 msgid "" "Create a new folder within your project to contain the common code, but do " -"not add it to Subversion" -msgstr "在你的项目创建一个包含普通代码的新目录，但不将其添加到Subversion" +"not add it to Git" +msgstr "在你的项目创建一个包含普通代码的新目录，但不将其添加到Git" #. (para) #: ../source/TortoiseGit_en.xml:13644 @@ -19912,10 +19912,10 @@ msgid "" "Remember that TortoiseGit is a GUI client, and this automation guide shows " "you how to make the TortoiseGit dialogs appear to collect user input. If you " "want to write a script which requires no input, you should use the official " -"Subversion command line client instead." +"Git command line client instead." msgstr "" "请记住TortoiseGit是一个GUI客户端，这个自动化指导为你展示了让TortoiseGit对话框" -"显示并收集客户输入，如果你希望编写不需要输入的脚本，你应该使用官方的Subversion" +"显示并收集客户输入，如果你希望编写不需要输入的脚本，你应该使用官方的Git" "命令行客户端。" #. (title) @@ -20720,13 +20720,13 @@ msgstr "CLI" #. (para) #: ../source/TortoiseGit_en.xml:14741 msgid "" -"Sometimes this manual refers you to the main Subversion documentation, which " -"describes Subversion in terms of the Command Line Interface (CLI). To help " +"Sometimes this manual refers you to the main Git documentation, which " +"describes Git in terms of the Command Line Interface (CLI). To help " "you understand what TortoiseGit is doing behind the scenes, we have compiled " "a list showing the equivalent CLI commands for each of TortoiseGit's GUI " "operations." msgstr "" -"有时候，本手册会参考Subversion的文档，会以命令行方式(CLI)描述Subversion术语，" +"有时候，本手册会参考Git的文档，会以命令行方式(CLI)描述Git术语，" "为了理解TortoiseGit后台的操作，我们编辑了一份列表，用来展示命令行命令和对应的" "TortoiseGit的GUI操作的关系。" @@ -20735,10 +20735,10 @@ msgstr "" msgid "" "Even though there are CLI equivalents to what TortoiseGit does, remember that " "TortoiseGit does not call the CLI but uses the " -"Subversion library directly." +"Git library directly." msgstr "" "即使有命令行对应TortoiseGit的操作，请记住TortoiseGit没有" -"调用命令行，而是直接使用了Subversion库。" +"调用命令行，而是直接使用了Git库。" #. (para) #: ../source/TortoiseGit_en.xml:14756 @@ -20746,10 +20746,10 @@ msgstr "" msgid "" "If you think you have found a bug in TortoiseGit, we may ask you to try to " "reproduce it using the CLI, so that we can distinguish TortoiseGit issues " -"from Subversion issues. This reference tells you which command to try." +"from Git issues. This reference tells you which command to try." msgstr "" "如果你发现了TortoiseGit的bug，我们会希望你能用命令行重现它，这样我们可以区分这" -"是TSVN还是Subversion的问题，这个参考告诉你该找那个命令。" +"是TSVN还是Git的问题，这个参考告诉你该找那个命令。" #. (title) #: ../source/TortoiseGit_en.xml:14764 @@ -20842,12 +20842,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14814 msgid "" -"Updating multiple items is currently not an atomic operation in Subversion. " +"Updating multiple items is currently not an atomic operation in Git. " "So TortoiseGit first finds the HEAD revision of the repository, and then " "updates all items to that particular revision number to avoid creating a " "mixed revision working copy." msgstr "" -"更新多个项目在Subversion还不是原子操作，所以TortoiseGit会首先找到版本库的HEAD" +"更新多个项目在Git还不是原子操作，所以TortoiseGit会首先找到版本库的HEAD" "修订版本，然后将所有项目更新到特定修订版本，防止出现混合修订版本的工作副本。" #. (para) @@ -20896,12 +20896,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14849 msgid "" -"In TortoiseGit, the commit dialog uses several Subversion commands. The first " +"In TortoiseGit, the commit dialog uses several Git commands. The first " "stage is a status check which determines the items in your working copy which " "can potentially be committed. You can review the list, diff files against " "BASE and select the items you want to be included in the commit." msgstr "" -"在TortoiseGit，提交对话框使用Subversion命令，第一部分是检查工作副本哪些文件可" +"在TortoiseGit，提交对话框使用Git命令，第一部分是检查工作副本哪些文件可" "能被提交，然后你可以检查列表，比较与BASE的区别，选择你希望提交包含的项目。" #. (screen) @@ -20924,11 +20924,11 @@ msgid "" "If Show unversioned files is checked, TortoiseGit will " "also show all unversioned files and folders in the working copy hierarchy, " "taking account of the ignore rules. This particular feature has no direct " -"equivalent in Subversion, as the svn status command does " +"equivalent in Git, as the svn status command does " "not descend into unversioned folders." msgstr "" "如果选择了显示未版本控制的文件，TortoiseGit会遵循忽略规则" -"显示工作目录中所有未版本控制的文件和文件夹。这个特性在Subversion中没有等价操" +"显示工作目录中所有未版本控制的文件和文件夹。这个特性在Git中没有等价操" "作，因为svn status 命令不扫描未版本控制的文件夹。" #. (para) @@ -20953,13 +20953,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:14874 msgid "" -"When you click on OK, the Subversion commit takes place. If you have left all " +"When you click on OK, the Git commit takes place. If you have left all " "the file selection checkboxes in their default state, TortoiseGit uses a " "single recursive commit of the working copy. If you deselect some files, then " "a non-recursive commit (-N) must be used, and every path " "must be specified individually on the commit command line." msgstr "" -"当你点击确认，开始执行Subversion提交。如果你不修改所有的文件检查框，" +"当你点击确认，开始执行Git提交。如果你不修改所有的文件检查框，" "TortoiseGit 会递归提交工作副本。如果你取消选择一些文件，那么就必须使用非递归提" "交 (-N) ，每个路径都必须在命令行上单独指定。" @@ -21207,13 +21207,13 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15027 msgid "" -"When you click on OK, the Subversion revert takes place. If you have left all " +"When you click on OK, the Git revert takes place. If you have left all " "the file selection checkboxes in their default state, TortoiseGit uses a " "single recursive (-R) revert of the working copy. If you " "deselect some files, then every path must be specified individually on the " "revert command line." msgstr "" -"当你点击确认时，开始Subversion撤销操作。如果你不修改所有的文件检查框，" +"当你点击确认时，开始Git撤销操作。如果你不修改所有的文件检查框，" "TortoiseGit 会递归撤销 (-R)工作副本的修改。如果你取消选择一" "些文件，那么就必须使用非递归撤销 ，每个路径都必须在命令行上单独指定。\"" @@ -21395,9 +21395,9 @@ msgstr "这个形式是当从一个未版本控制目录访问，并且文件夹 #: ../source/TortoiseGit_en.xml:15129 msgid "" "Exporting a working copy to a different location is done without using the " -"Subversion library, so there's no matching command line equivalent." +"Git library, so there's no matching command line equivalent." msgstr "" -"导出一个工作副本到一个目录没有使用Subversion的库，所以没有等同的命令行匹配。" +"导出一个工作副本到一个目录没有使用Git的库，所以没有等同的命令行匹配。" #. (para) #: ../source/TortoiseGit_en.xml:15134 @@ -21537,10 +21537,10 @@ msgstr "" msgid "" "Applying patches is a tricky business unless the patch and working copy are " "at the same revision. Luckily for you, you can use TortoiseMerge, which has " -"no direct equivalent in Subversion." +"no direct equivalent in Git." msgstr "" "如果补丁和工作副本不是同一版本的话，那么应用补丁会是一件很棘手的事情。幸运的" -"是，你可以使用 TortoiseMerge(在Subversion中没有等同的工具)。" +"是，你可以使用 TortoiseMerge(在Git中没有等同的工具)。" #. (title) #: ../source/TortoiseGit_en.xml:15229 @@ -21563,8 +21563,8 @@ msgstr "重载优先级" #. (para) #: ../source/TortoiseGit_en.xml:15244 msgid "" -"Every file and folder has a Subversion status value as reported by the " -"Subversion library. In the command line client, these are represented by " +"Every file and folder has a Git status value as reported by the " +"Git library. In the command line client, these are represented by " "single letter codes, but in TortoiseGit they are shown graphically using the " "icon overlays. Because the number of overlays is very limited, each overlay " "may represent one of several status values." @@ -21617,8 +21617,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15286 msgid "" -" The In " -"Subversion overlay is used to represent an item which is in the " +" The In " +"Git overlay is used to represent an item which is in the " "normal state, or a versioned item whose state is not yet " "known. Because TortoiseGit uses a background caching process to gather " "status, it may take a few seconds before the overlay updates." @@ -21630,10 +21630,10 @@ msgid "" " The Needs Lock overlay is used to indicate when a file has the svn:needs-" "lock property set. For working copies which were created using " -"Subversion 1.4.0 and later, the svn:needs-lock status is " -"cached locally by Subversion and this is used to determine when to show this " +"Git 1.4.0 and later, the svn:needs-lock status is " +"cached locally by Git and this is used to determine when to show this " "overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows " -"this overlay when the file has read-only status. Note that Subversion " +"this overlay when the file has read-only status. Note that Git " "automatically upgrades working copies when you update them, although the " "caching of the svn:needs-lock property may not happen " "until the file itself is updated." @@ -21676,7 +21676,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15330 msgid "" -"If an item has subversion status none (the item is not " +"If an item has Git status none (the item is not " "within a working copy) then no overlay is shown. If you have chosen to " "disable the Ignored and Unversioned " "overlays then no overlay will be shown for those files either." @@ -21685,14 +21685,14 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15337 msgid "" -"An item can only have one Subversion status value. For example a file could " +"An item can only have one Git status value. For example a file could " "be locally modified and it could be marked for deletion at the same time. " -"Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself." +"Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "" -"每个条目只有一个 Subversion 状态。例如一个文件可以被本地修改，同时被标记为删" -"除。Subversion 返回一个状态 - 即已经删除。这些优先级是 " -"Subversion 自己定义的。" +"每个条目只有一个 Git 状态。例如一个文件可以被本地修改，同时被标记为删" +"除。Git 返回一个状态 - 即已经删除。这些优先级是 " +"Git 自己定义的。" #. (para) #: ../source/TortoiseGit_en.xml:15344 @@ -21783,27 +21783,27 @@ msgstr "用 SSH 使服务器更安全" #. (para) #: ../source/TortoiseGit_en.xml:15407 msgid "" -"This section provides a step-by-step guide to setting up Subversion and " +"This section provides a step-by-step guide to setting up Git and " "TortoiseGit to use the svn+ssh protocol. If you already " "use authenticated SSH connections to login to your server, then you are " -"already there and you can find more detail in the Subversion book. If you are " -"not using SSH but would like to do so to protect your Subversion " +"already there and you can find more detail in the Git book. If you are " +"not using SSH but would like to do so to protect your Git " "installation, this guide gives a simple method which does not involve " -"creating a separate SSH user account on the server for every subversion user." +"creating a separate SSH user account on the server for every Git user." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15417 msgid "" -"In this implementation we create a single SSH user account for all subversion " +"In this implementation we create a single SSH user account for all Git " "users, and use different authentication keys to differentiate between the " -"real Subversion users." +"real Git users." msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15422 msgid "" -"In this appendix we assume that you already have the subversion tools " +"In this appendix we assume that you already have the Git tools " "installed, and that you have created a repository as detailed elsewhere in " "this manual. Note that you should not start svnserve as " "a service or daemon when used with SSH." @@ -21814,7 +21814,7 @@ msgstr "" msgid "" "Much of the information here comes from a tutorial provided by Marc Logemann, " "which can be found at www.logemann.orgwww.logemann.org Additional information on setting up a Windows server was provided by " "Thorsten Müller. Thanks guys!" msgstr "" @@ -21837,8 +21837,8 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:15449 msgid "" -"One point to note is that if you build Subversion from source and do not " -"provide any argument to ./configure, Subversion creates " +"One point to note is that if you build Git from source and do not " +"provide any argument to ./configure, Git creates " "a bin directory under /usr/local " "and places its binaries there. If you want to use tunneling mode with SSH, " "you have to be aware that the user logging in via SSH needs to execute the " @@ -22037,8 +22037,8 @@ msgid "" "So far we have only tested that you can login using SSH. Now we need to make " "sure that the SSH connection can actually run svnserve. On the server modify " "/home/svnuser/.ssh/authorized_keys as follows to allow " -"many subversion authors to use the same system account, svnuser. Note that every subversion author uses the same login but a " +"many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a " "different authentication key, thus you have to add one line for every author." msgstr "" @@ -22217,10 +22217,10 @@ msgstr "术语表" #. (para) #: ../source/TortoiseGit_en.xml:15764 msgid "" -"A Subversion command that is used to add a file or directory to your working " +"A Git command that is used to add a file or directory to your working " "copy. The new items are added to the repository when you commit." msgstr "" -"向你的工作副本中增加文件或者目录时使用的 Subversion 命令。在你提交的时候新的项" +"向你的工作副本中增加文件或者目录时使用的 Git 命令。在你提交的时候新的项" "就会被加入到版本库中。" #. (glossterm) @@ -22264,7 +22264,7 @@ msgid "" "used on network shares. Default for pre 1.2 repositories." msgstr "" "伯克利DB(Berkeley DB)，版本库可以使用的一种经过充分测试的后台数据库实现，不能" -"在通过网络共享的文件系统上使用，伯克利DB是 Subversion 1.2 版本以前的缺省版本库" +"在通过网络共享的文件系统上使用，伯克利DB是 Git 1.2 版本以前的缺省版本库" "格式。" #. (glossterm) @@ -22281,44 +22281,44 @@ msgid "" "You can create a branch off the main development line so as to develop a new " "feature without rendering the main line unstable. Or you can branch a stable " "release to which you make only bug fixes, while new developments take place " -"on the unstable trunk. In Subversion a branch is implemented as a " +"on the unstable trunk. In Git a branch is implemented as a " "cheap copy." msgstr "" "有一个版本控制系统经常使用，来描述在某个时间点的两个人追随不同的路径的术语。你" "可以创建一个分支离开开发的主线来添加一个新特性，而不必影响主线的稳定，或者你可" -"以创建一个分支用来发布bug修正，而新的开发发生在不稳定的主干。在 Subversion，分" +"以创建一个分支用来发布bug修正，而新的开发发生在不稳定的主干。在 Git，分" "支是使用廉价的复制实现的。" #. (para) #: ../source/TortoiseGit_en.xml:15821 msgid "" -"A Subversion command which creates a local working copy in an empty directory " +"A Git command which creates a local working copy in an empty directory " "by downloading versioned files from the repository." msgstr "" -"一个 Subversion 命令在空目录通过从版本库下载版本控制的文件来创建本地工作副本。" +"一个 Git 命令在空目录通过从版本库下载版本控制的文件来创建本地工作副本。" #. (para) #: ../source/TortoiseGit_en.xml:15830 #, fuzzy msgid "" -"To quote from the Subversion book: Recursively clean up the working " +"To quote from the Git book: Recursively clean up the working " "copy, removing locks and resuming unfinished operations. If you ever get a " "working copy locked error, run this command to remove " "stale locks and get your working copy into a usable state again. " "Note that in this context lock refers to local " "filesystem locking, not repository locking." msgstr "" -"来自 Subversion 手册的引用: 递归的清理工作副本，删除锁定和保留的未完成" +"来自 Git 手册的引用: 递归的清理工作副本，删除锁定和保留的未完成" "操作。如果你得到工作副本已锁定的错误，运行这个命令删除无用" "的锁定，并将工作副本恢复到可用状态。" #. (para) #: ../source/TortoiseGit_en.xml:15847 msgid "" -"This Subversion command is used to pass the changes in your local working " +"This Git command is used to pass the changes in your local working " "copy back into the repository, creating a new repository revision." msgstr "" -"一个 Subversion 操作，用来将本地修改的内容传递回版本库，创建一个新的版本库修订" +"一个 Git 操作，用来将本地修改的内容传递回版本库，创建一个新的版本库修订" "版本。" #. (glossterm) @@ -22330,12 +22330,12 @@ msgstr "冲突" #: ../source/TortoiseGit_en.xml:15857 msgid "" "When changes from the repository are merged with local changes, sometimes " -"those changes occur on the same lines. In this case Subversion cannot " +"those changes occur on the same lines. In this case Git cannot " "automatically decide which version to use and the file is said to be in " "conflict. You have to edit the file manually and resolve the conflict before " "you can commit any further changes." msgstr "" -"当版本库的修改合并到本地修改，有时候修改发生在同一行，这种情况下，Subversion " +"当版本库的修改合并到本地修改，有时候修改发生在同一行，这种情况下，Git " "不能自动决定使用文件的那一行，在提交之前，你需要手工编辑文件解决冲突。" #. (glossterm) @@ -22346,13 +22346,13 @@ msgstr "复制" #. (para) #: ../source/TortoiseGit_en.xml:15869 msgid "" -"In a Subversion repository you can create a copy of a single file or an " +"In a Git repository you can create a copy of a single file or an " "entire tree. These are implemented as cheap copies which act a " "bit like a link to the original in that they take up almost no space. Making " "a copy preserves the history of the item in the copy, so you can trace " "changes made before the copy was made." msgstr "" -"在 Subversion 版本库，你可以创建一个文件或整个目录树的副本，这是通过廉" +"在 Git 版本库，你可以创建一个文件或整个目录树的副本，这是通过廉" "价复制实现的，看起来很像链接到原来的位置，几乎不占用任何空间。创建一个" "保存历史的副本，这样你就可以跟踪副本之前的修改。" @@ -22396,11 +22396,11 @@ msgstr "FSFS" #: ../source/TortoiseGit_en.xml:15912 #, fuzzy msgid "" -"A proprietary Subversion filesystem backend for repositories. Can be used on " +"A proprietary Git filesystem backend for repositories. Can be used on " "network shares. Default for 1.2 and newer repositories." msgstr "" -"FS文件系统，版本库可以使用的一种 Subversion 专用的后台文件系统格式，能够在通过" -"网络共享的文件系统上使用，FSFS 是Subversion 1.2 版本以后的缺省版本库格式。" +"FS文件系统，版本库可以使用的一种 Git 专用的后台文件系统格式，能够在通过" +"网络共享的文件系统上使用，FSFS 是Git 1.2 版本以后的缺省版本库格式。" #. (para) #: ../source/TortoiseGit_en.xml:15921 @@ -22422,9 +22422,9 @@ msgstr "版本库里文件或目录的最新版本。" #. (para) #: ../source/TortoiseGit_en.xml:15937 msgid "" -"Subversion command to import an entire folder hierarchy into the repository " +"Git command to import an entire folder hierarchy into the repository " "in a single revision." -msgstr "在一个修订里将整个目录导入到版本库的 Subversion 命令。" +msgstr "在一个修订里将整个目录导入到版本库的 Git 命令。" #. (para) #: ../source/TortoiseGit_en.xml:15946 @@ -22489,14 +22489,14 @@ msgstr "补丁" #: ../source/TortoiseGit_en.xml:15990 msgid "" "If a working copy has changes to text files only, it is possible to use " -"Subversion's Diff command to generate a single file summary of those changes " +"Git's Diff command to generate a single file summary of those changes " "in Unified Diff format. A file of this type is often referred to as a " "Patch, and it can be emailed to someone else (or to a mailing " "list) and applied to another working copy. Someone without commit access can " "make changes and submit a patch file for an authorized committer to apply. Or " "if you are unsure about a change you can submit a patch for others to review." msgstr "" -"如果工作副本只有文本文件有修改，也可以使用 Subversion 的 Diff 命令生成标准区别" +"如果工作副本只有文本文件有修改，也可以使用 Git 的 Diff 命令生成标准区别" "格式的单文件的修改摘要。这种文件通常被叫做补丁，可以邮寄给任何" "人，使之可以应用到另一个工作副本。一些没有提交访问的人可以通过提交补丁文件给有" "授权的人来应用补丁，或者是在不确定修改时提交补丁给别人进行评审。" @@ -22509,17 +22509,17 @@ msgstr "属性" #. (para) #: ../source/TortoiseGit_en.xml:16005 msgid "" -"In addition to versioning your directories and files, Subversion allows you " +"In addition to versioning your directories and files, Git allows you " "to add versioned metadata - referred to as properties to each " "of your versioned directories and files. Each property has a name and a " -"value, rather like a registry key. Subversion has some special properties " +"value, rather like a registry key. Git has some special properties " "which it uses internally, such as svn:eol-style. " "TortoiseGit has some too, such as tsvn:logminsize. You can " "add your own properties with any name and value you choose." msgstr "" -"除了版本控制文件和目录，Subversion 允许你添加版本控制的元数据 - 被称作每个文件" +"除了版本控制文件和目录，Git 允许你添加版本控制的元数据 - 被称作每个文件" "和目录的属性 。每个属性都有一个名称和一个值，非常类似于注册表" -"键。Subversion 有一些内置的特别属性，例如 svn:eol-style。" +"键。Git 有一些内置的特别属性，例如 svn:eol-style。" "TortoiseGit 也有一些类似的，例如 tsvn:logminsize，你可以选" "择名称和值添加你自己的属性。" @@ -22577,12 +22577,12 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:16060 msgid "" -"Subversion keeps a local pristine copy of each file as it was " +"Git keeps a local pristine copy of each file as it was " "when you last updated your working copy. If you have made changes and decide " "you want to undo them, you can use the revert command to go " "back to the pristine copy." msgstr "" -"Subversion 会为每个更新到工作副本的文件保留一份原始副本。如果你" +"Git 会为每个更新到工作副本的文件保留一份原始副本。如果你" "做出了修改，并希望取消修改，你可以使用revert回到原始状态。" #. (glossterm) @@ -22636,15 +22636,15 @@ msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:16101 -msgid "A frequently-used abbreviation for Subversion." -msgstr "Subversion 的常见缩写形式。" +msgid "A frequently-used abbreviation for Git." +msgstr "Git 的常见缩写形式。" #. (para) #: ../source/TortoiseGit_en.xml:16104 msgid "" -"The name of the Subversion custom protocol used by the svnservesvnserve repository server." -msgstr "Subversion 的svnserve版本库服务器使用的自定义协议名称。" +msgstr "Git 的svnserve版本库服务器使用的自定义协议名称。" #. (para) #: ../source/TortoiseGit_en.xml:16113 @@ -22663,7 +22663,7 @@ msgstr "" #. (para) #: ../source/TortoiseGit_en.xml:16127 msgid "" -"This Subversion command pulls down the latest changes from the repository " +"This Git command pulls down the latest changes from the repository " "into your working copy, merging any changes made by others with local changes " "in the working copy." msgstr "" diff --git a/doc/source/Hacking.txt b/doc/source/Hacking.txt index 2fcba36..226dc70 100644 --- a/doc/source/Hacking.txt +++ b/doc/source/Hacking.txt @@ -84,7 +84,7 @@ Rules DAV svn SVNParentPath D:\SVN AuthType Basic -AuthName "Subversion repositories" +AuthName "Git repositories" AuthUserFile passwd #AuthzSVNAccessFile svnaccessfile Require valid-user diff --git a/doc/source/en/SubWCRev.txt b/doc/source/en/SubWCRev.txt index c175180..cd8e810 100644 --- a/doc/source/en/SubWCRev.txt +++ b/doc/source/en/SubWCRev.txt @@ -1,14 +1,14 @@ -SubWCRev - A Working Copy Status Tool for Subversion +SubWCRev - A Working Copy Status Tool for Git ------------------------------------------------------ SubWCRev is Windows console program which can be used to read the status -of a Subversion working copy and optionally perform keyword substitution +of a Git working copy and optionally perform keyword substitution in a template file. usage: SubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe] Params: -WorkingCopyPath : path to a Subversion working copy. +WorkingCopyPath : path to a Git working copy. SrcVersionFile : path to a template header file containing keywords. DstVersionFile : path to save the resulting parsed file. -n : if given, then SubWCRev will error if the working @@ -27,7 +27,7 @@ DstVersionFile : path to save the resulting parsed file. Switches must be given in a single argument, eg. '-nm' not '-n -m'. -SubWCRev reads the Subversion status of all files in a working copy, excluding +SubWCRev reads the Git status of all files in a working copy, excluding externals. It records the highest commit revision number found, and the commit timestamp of that revision, and also whether there are local modifications in the working copy, or mixed update revisions. The revision number, update diff --git a/doc/source/en/TortoiseGit/tortoisegit.xml b/doc/source/en/TortoiseGit/tortoisegit.xml index f4625f9..62510f4 100644 --- a/doc/source/en/TortoiseGit/tortoisegit.xml +++ b/doc/source/en/TortoiseGit/tortoisegit.xml @@ -8,11 +8,6 @@ First - Frank - Li - - + + Frank + Li + @@ -44,5 +42,10 @@ + + + diff --git a/doc/source/en/TortoiseGit/tsvn_app_admins.xml b/doc/source/en/TortoiseGit/tsvn_app_admins.xml index ee2f524..1ace904 100644 --- a/doc/source/en/TortoiseGit/tsvn_app_admins.xml +++ b/doc/source/en/TortoiseGit/tsvn_app_admins.xml @@ -175,14 +175,6 @@ msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE - 0x0000000000000001 - Checkout - - - 0x0000000000000002 - Update - - 0x0000000000000004 Commit @@ -207,10 +199,6 @@ msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE Switch - 0x0000000000000100 - Import - - 0x0000000000000200 Export @@ -235,10 +223,6 @@ msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE Rename - 0x0000000000008000 - Update to revision - - 0x0000000000010000 Diff @@ -251,10 +235,6 @@ msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE Edit Conflicts - 0x0000000000080000 - Relocate - - 0x0000000000100000 Check for modifications @@ -263,10 +243,6 @@ msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE Ignore - 0x0000000000400000 - Repository Browser - - 0x0000000000800000 Blame @@ -283,24 +259,44 @@ msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE Revision graph - 0x0000000008000000 - Lock + 0x0000000020000000 + Properties + + + 0x0000000800000000 + Pull - 0x0000000010000000 - Remove Lock + 0x0000001000000000 + Push - 0x0000000020000000 - Properties + 0x0000002000000000 + Clone + + + 0x0000004000000000 + Tag + + + 0x0000008000000000 + Format Patch + + + 0x0000010000000000 + Import Patch + + + 0x0000020000000000 + Cherry Pick - 0x0000000040000000 - Diff with URL + 0x0000040000000000 + Fetch - 0x0000000080000000 - Delete unversioned items + 0x0000080000000000 + Rebase 0x2000000000000000 diff --git a/doc/source/en/TortoiseGit/tsvn_app_automation.xml b/doc/source/en/TortoiseGit/tsvn_app_automation.xml index b828a31..fda210e 100644 --- a/doc/source/en/TortoiseGit/tsvn_app_automation.xml +++ b/doc/source/en/TortoiseGit/tsvn_app_automation.xml @@ -13,7 +13,7 @@ Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should - use the official Subversion command line client instead. + use the official Git command line client instead. diff --git a/doc/source/en/TortoiseGit/tsvn_app_cli.xml b/doc/source/en/TortoiseGit/tsvn_app_cli.xml index 2dff073..f8a7c23 100644 --- a/doc/source/en/TortoiseGit/tsvn_app_cli.xml +++ b/doc/source/en/TortoiseGit/tsvn_app_cli.xml @@ -10,8 +10,8 @@ CLI - Sometimes this manual refers you to the main Subversion - documentation, which describes Subversion in terms of the + Sometimes this manual refers you to the main Git + documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of @@ -21,13 +21,13 @@ Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not - call the CLI but uses the Subversion library directly. + call the CLI but uses the Git library directly. If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so - that we can distinguish TortoiseGit issues from Subversion + that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try. @@ -84,7 +84,7 @@ svn update [-r rev] PATH Updating multiple items is currently not an atomic operation - in Subversion. So + in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy. @@ -118,7 +118,7 @@ svn update [-r rev] [-N] [--ignore-externals] PATH Commit - In TortoiseGit, the commit dialog uses several Subversion commands. + In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you @@ -131,7 +131,7 @@ svn status -v PATH If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. - This particular feature has no direct equivalent in Subversion, + This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders. @@ -143,7 +143,7 @@ svn status -v PATH svn add PATH... - When you click on OK, the Subversion commit takes place. If you have + When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit @@ -219,7 +219,7 @@ svn status -u -v PATH If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. - This particular feature has no direct equivalent in Subversion, + This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders. @@ -296,7 +296,7 @@ svn status -v PATH want to be included in the revert. - When you click on OK, the Subversion revert takes place. If you have + When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then @@ -399,7 +399,7 @@ svn export [-r rev] [--ignore-externals] URL Export_PATH Exporting a working copy to a different location is done without - using the Subversion library, so there's no matching command + using the Git library, so there's no matching command line equivalent. @@ -487,7 +487,7 @@ svn diff PATH > patch-file Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct - equivalent in Subversion. + equivalent in Git. diff --git a/doc/source/en/TortoiseGit/tsvn_app_faq.xml b/doc/source/en/TortoiseGit/tsvn_app_faq.xml index 51ba723..f89744c 100644 --- a/doc/source/en/TortoiseGit/tsvn_app_faq.xml +++ b/doc/source/en/TortoiseGit/tsvn_app_faq.xml @@ -15,8 +15,8 @@ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists - dev@TortoiseGit.tigris.org and - users@TortoiseGit.tigris.org. + tortoisegit-dev@googlegroups.com and + tortoisegit-users@googlegroups.com . We also maintain a project @@ -31,11 +31,11 @@ If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. - users@TortoiseGit.tigris.org is the one to use + tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on - dev@TortoiseGit.tigris.org. + tortoisegit-dev@googlegroups.com . diff --git a/doc/source/en/TortoiseGit/tsvn_app_howto.xml b/doc/source/en/TortoiseGit/tsvn_app_howto.xml index 53c6137..997d873 100644 --- a/doc/source/en/TortoiseGit/tsvn_app_howto.xml +++ b/doc/source/en/TortoiseGit/tsvn_app_howto.xml @@ -69,7 +69,7 @@ There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for - all Subversion clients, but requires access to the server directly. + all Git clients, but requires access to the server directly. Hook-script on the server @@ -90,7 +90,7 @@ This method is the recommended way if your users also use other - Subversion clients than TortoiseGit. The drawback is that the commit + Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK @@ -291,7 +291,7 @@ The only way to remove data from the repository is to use the - Subversion command line tool svnadmin. + Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance @@ -390,7 +390,7 @@ refer to . - Commit the new folder. Now when you update, Subversion + Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. @@ -419,7 +419,7 @@ Use a nested working copy Create a new folder within your project to contain the - common code, but do not add it to Subversion + common code, but do not add it to Git Select diff --git a/doc/source/en/TortoiseGit/tsvn_app_internals.xml b/doc/source/en/TortoiseGit/tsvn_app_internals.xml index f8a8888..74e3696 100644 --- a/doc/source/en/TortoiseGit/tsvn_app_internals.xml +++ b/doc/source/en/TortoiseGit/tsvn_app_internals.xml @@ -17,8 +17,8 @@ overlays - Every file and folder has a Subversion status value as reported - by the Subversion library. In the command line client, these + Every file and folder has a Git status value as reported + by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of @@ -59,8 +59,8 @@ has been added to version control. - - The In Subversion overlay is used to + + The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to @@ -72,11 +72,11 @@ The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using - Subversion 1.4.0 and later, the svn:needs-lock - status is cached locally by Subversion and this is used to + Git 1.4.0 and later, the svn:needs-lock + status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the - file has read-only status. Note that Subversion automatically + file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated. @@ -103,18 +103,18 @@ This overlay is optional. - If an item has subversion status none (the item + If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either. - An item can only have one Subversion status value. For example + An item can only have one Git status value. For example a file could be locally modified and it could be marked for - deletion at the same time. Subversion returns a single status + deletion at the same time. Git returns a single status value - in this case deleted. - Those priorities are defined within Subversion itself. + Those priorities are defined within Git itself. When TortoiseGit displays the status recursively (the default diff --git a/doc/source/en/TortoiseGit/tsvn_app_ssh.xml b/doc/source/en/TortoiseGit/tsvn_app_ssh.xml index 00ee157..0019d5a 100644 --- a/doc/source/en/TortoiseGit/tsvn_app_ssh.xml +++ b/doc/source/en/TortoiseGit/tsvn_app_ssh.xml @@ -5,21 +5,21 @@ This section provides a step-by-step guide to setting up - Subversion and TortoiseGit to use the svn+ssh + Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail - in the Subversion book. If you are not using SSH but would like to do - so to protect your Subversion installation, this guide gives a simple + in the Git book. If you are not using SSH but would like to do + so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account - on the server for every subversion user. + on the server for every Git user. In this implementation we create a single SSH user account for - all subversion users, and use different authentication keys to - differentiate between the real Subversion users. + all Git users, and use different authentication keys to + differentiate between the real Git users. - In this appendix we assume that you already have the subversion tools + In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH. @@ -27,7 +27,7 @@ Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at - + www.logemann.org Additional information on setting up a Windows server was @@ -46,9 +46,9 @@ ps xa | grep sshd and look for ssh jobs. - One point to note is that if you build Subversion from source and + One point to note is that if you build Git from source and do not provide any argument to ./configure, - Subversion creates a bin directory under + Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program @@ -212,8 +212,8 @@ ChallengeResponseAuthentication no So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys - as follows to allow many subversion authors to use the same system account, - svnuser. Note that every subversion author uses the same + as follows to allow many Git authors to use the same system account, + svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author. diff --git a/doc/source/en/TortoiseGit/tsvn_basics.xml b/doc/source/en/TortoiseGit/tsvn_basics.xml index e0528db..95da1c7 100644 --- a/doc/source/en/TortoiseGit/tsvn_basics.xml +++ b/doc/source/en/TortoiseGit/tsvn_basics.xml @@ -1,33 +1,33 @@ - Basic Concepts - Subversion book + Git book This chapter is a slightly modified version of the same chapter - in the Subversion book. An online version of the Subversion book is + in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/ . - This chapter is a short, casual introduction to Subversion. + This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind - Subversion, and show some simple examples of Subversion in + Git, and show some simple examples of Git in use. Even though the examples in this chapter show people sharing - collections of program source code, keep in mind that Subversion + collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers. @@ -38,7 +38,7 @@ repository - Subversion is a centralized system for sharing information. + Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical @@ -56,7 +56,7 @@ So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your - usual breed. What makes the Subversion repository special is + usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and @@ -178,7 +178,7 @@ The Copy-Modify-Merge Solution - Subversion, CVS, and other version control systems use a + Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working @@ -258,20 +258,20 @@ - What does Subversion Do? + What does Git Do? - Subversion uses the copy-modify-merge solution by default, + Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, - as of Version 1.2, Subversion also supports file locking, + as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply - forced into a locking policy by management, Subversion + forced into a locking policy by management, Git will still provide the features you need. - Subversion in Action + Git in Action Working Copies @@ -279,42 +279,42 @@ You've already read about working copies; now we'll - demonstrate how the Subversion client creates and uses + demonstrate how the Git client creates and uses them. - A Subversion working copy is an ordinary directory tree on + A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: - Subversion will never incorporate other people's changes, nor + Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so. After you've made some changes to the files in your - working copy and verified that they work properly, Subversion + working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, - Subversion provides you with commands to merge those changes + Git provides you with commands to merge those changes into your working directory (by reading from the repository). A working copy also contains some extra files, created and - maintained by Subversion, to help it carry out these commands. + maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative - directory help Subversion recognize which files contain + directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work. - A typical Subversion repository often holds the files (or + A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to @@ -343,8 +343,8 @@ Suppose you make changes to button.c. Since the .svn directory remembers the - file's modification date and original contents, Subversion can - tell that you've changed the file. However, Subversion does + file's modification date and original contents, Git can + tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking @@ -352,7 +352,7 @@ To publish your changes to others, you can use - Subversion's commit command. + Git's commit command. Now your changes to button.c have @@ -365,20 +365,20 @@ working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left - unchanged; Subversion only modifies working copies at the + unchanged; Git only modifies working copies at the user's request. To bring her project up to date, Sally can ask - Subversion to update her working copy, - by using the Subversion update command. + Git to update her working copy, + by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out. Note that Sally didn't need to - specify which files to update; Subversion uses the information + specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date. @@ -387,7 +387,7 @@ Repository URLs - Subversion repositories can be accessed through many + Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access @@ -418,7 +418,7 @@ http:// - Access via WebDAV protocol to Subversion-aware Apache server. + Access via WebDAV protocol to Git-aware Apache server. @@ -451,7 +451,7 @@ - For the most part, Subversion's URLs use the standard + For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used @@ -516,7 +516,7 @@ file:///X|/path/to/repos In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or - none of them take place. Subversion retains this + none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions. @@ -545,13 +545,13 @@ file:///X|/path/to/repos Global Revision Numbers Unlike those of many other version control systems, - Subversion's revision numbers apply to entire + Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a - Subversion user talks about ``revision 5 of + Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do @@ -599,7 +599,7 @@ calc/Makefile:6 appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in - revisions 4, 5, and 6, but Subversion will mark your working + revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally @@ -609,7 +609,7 @@ calc/Makefile:6 How Working Copies Track the Repository - For each file in a working directory, Subversion records + For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area: @@ -629,7 +629,7 @@ calc/Makefile:6 Given this information, by talking to the repository, - Subversion can tell which of the following four states a + Git can tell which of the following four states a working file is in: @@ -683,7 +683,7 @@ calc/Makefile:6 of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public - changes with the local changes. If Subversion can't + changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict. @@ -696,7 +696,7 @@ calc/Makefile:6 Summary - We've covered a number of fundamental Subversion concepts in + We've covered a number of fundamental Git concepts in this chapter: @@ -709,13 +709,13 @@ calc/Makefile:6 We've seen some simple examples of how two collaborators - can use Subversion to publish and receive changes from one + can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model. - We've talked a bit about the way Subversion tracks and + We've talked a bit about the way Git tracks and manages information in a working copy. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug.xml index 5c21514..0fd8a3f 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug.xml @@ -8,21 +8,21 @@ This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control - systems, and not an introduction to Subversion + systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it. - If you need an introduction to version control with Subversion, + If you need an introduction to version control with Git, then we recommend you read the fantastic book: -Version Control with Subversion +Version Control with Git . This document is also a work in progress, just as TortoiseGit and - Subversion are. If you find any mistakes, please report them to + Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on @@ -43,13 +43,13 @@ - You should know the basics of Subversion. + You should know the basics of Git. You should have set up a server and/or have access - to a Subversion repository. + to a Git repository. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_branchtag.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_branchtag.xml index 8efb711..b32aa55 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_branchtag.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_branchtag.xml @@ -32,7 +32,7 @@ environment. This process is known as tagging. - Subversion does not have special commands for branching + Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal @@ -219,7 +219,7 @@ - Although Subversion itself makes no distinction between tags + Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_bugtracker.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_bugtracker.xml index e5f0d92..254036d 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_bugtracker.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_bugtracker.xml @@ -17,7 +17,7 @@ It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate - the changes they make in Subversion with a specific ID in their issue tracker. + the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message @@ -322,7 +322,7 @@ No Issue Tracker Information from Repository Browser - Because the issue tracker integration depends upon accessing subversion + Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser. @@ -330,7 +330,7 @@ This issue tracker integration is not restricted to TortoiseGit; it can be used - with any Subversion client. For more information, read the full + with any Git client. For more information, read the full Issue Tracker Integration Specification diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_checkout.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_checkout.xml index 1fd6f0c..e154e3f 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_checkout.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_checkout.xml @@ -170,7 +170,7 @@ Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, - which itself is fully populated. Subversion has created the + which itself is fully populated. Git has created the intermediate folders for you without populating them. @@ -181,7 +181,7 @@ Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. - That feature may be added in a later version of Subversion. + That feature may be added in a later version of Git. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_cleanup.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_cleanup.xml index ad4e2c0..ee618af 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_cleanup.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_cleanup.xml @@ -6,7 +6,7 @@ cleanup - If a Subversion command cannot complete successfully, perhaps + If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use @@ -18,7 +18,7 @@ Cleanup has another useful side effect. If a file date changes - but its content doesn't, Subversion cannot tell whether it has + but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs @@ -29,7 +29,7 @@ Use Commit Timestamps - Some earlier releases of Subversion were affected by a bug + Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_commit.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_commit.xml index b863d90..762d9e2 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_commit.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_commit.xml @@ -133,9 +133,9 @@ are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken - from the no_unlock option in the Subversion + from the no_unlock option in the Git configuration file. Read - for information on how to edit the Subversion configuration file. + for information on how to edit the Git configuration file. Drag and Drop @@ -157,9 +157,9 @@ Repairing External Renames - Sometimes files get renamed outside of Subversion, and they show up + Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid - losing the history you need to notify Subversion about the connection. + losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use @@ -173,7 +173,7 @@ Change Lists - The commit dialog supports Subversion's changelist feature to help + The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in . diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_conflicts.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_conflicts.xml index ba1a3e0..615e5e7 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_conflicts.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_conflicts.xml @@ -13,7 +13,7 @@ Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same - few lines of a file. As Subversion knows nothing of your + few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string @@ -26,7 +26,7 @@ code merged from repository >>>>>>> revision - Also, for every conflicted file Subversion places three + Also, for every conflicted file Git places three additional files in your directory: @@ -55,7 +55,7 @@ filename.ext.rNEWREV - This is the file that your Subversion + This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository. @@ -89,7 +89,7 @@ to allow you to commit your changes. - If you have conflicts with binary files, Subversion does + If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_copy.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_copy.xml index 8f8b0bf..6ca80a1 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_copy.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_copy.xml @@ -23,7 +23,7 @@ You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the - new copy is related to the original in Subversion. + new copy is related to the original in Git. The easiest way to copy files and folders from within a working copy is diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_diff.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_diff.xml index d91b5c5..87ae8bf 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_diff.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_diff.xml @@ -144,7 +144,7 @@ If you want to see the differences between a file in your - working copy, and a file in any Subversion repository, + working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_export.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_export.xml index f18b362..76c627c 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_export.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_export.xml @@ -1,7 +1,7 @@ - Exporting a Subversion Working Copy + Exporting a Git Working Copy export @@ -78,7 +78,7 @@ Exporting single files The export dialog does not allow exporting single files, even - though Subversion can. + though Git can. To export single files with TortoiseGit, you have to use diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_general.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_general.xml index f7d15bf..725ec8a 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_general.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_general.xml @@ -149,8 +149,8 @@ Enter your username and password. The checkbox will make TortoiseGit - store the credentials in Subversion's default directory: - %APPDATA%\Subversion\auth in three subdirectories: + store the credentials in Git's default directory: + %APPDATA%\Git\auth in three subdirectories: @@ -176,7 +176,7 @@ If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached - authentication data from the Subversion auth + authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to . @@ -184,11 +184,11 @@ Some people like to have the authentication data deleted when they log off Windows, or on shutdown. The way to do that is to use a shutdown - script to delete the %APPDATA%\Subversion\auth + script to delete the %APPDATA%\Git\auth directory, e.g. @echo off -rmdir /s /q "%APPDATA%\Subversion\auth" +rmdir /s /q "%APPDATA%\Git\auth" You can find a description of how to install such scripts at diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_ignore.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_ignore.xml index 63b0dba..0f1e8b0 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_ignore.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_ignore.xml @@ -60,7 +60,7 @@ Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. - It applies to all Subversion projects, but on + It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for @@ -72,7 +72,7 @@ Ignoring Versioned Items Versioned files and folders can never be ignored - that's a feature - of Subversion. If you versioned a file by mistake, read + of Git. If you versioned a file by mistake, read for instructions on how to unversion it. @@ -86,7 +86,7 @@ pattern matching - Subversion's ignore patterns make use of filename globbing, + Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_import.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_import.xml index 5b8a8b9..a8f65b1 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_import.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_import.xml @@ -26,7 +26,7 @@ for further advice. - This section describes the Subversion import command, which was designed + This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: @@ -208,7 +208,7 @@ C:\Projects\Widget\images So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its - parent folder, i.e. we've set the Subversion property + parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit. @@ -240,7 +240,7 @@ C:\Projects\Widget\images Properties from the context menu. - The Properties Dialog comes up. Then go to the Subversion tab. + The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format @@ -260,7 +260,7 @@ quick_graphs http://graphics.red-bean.com/repos/fast%20graphics skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker Now click Set and commit your changes. - When you (or any other user) update your working copy, Subversion + When you (or any other user) update your working copy, Git will create a sub-folder D:\dev\project1\sounds and checkout the sounds project, another sub-folder D:\dev\project1\quick graphs @@ -306,7 +306,7 @@ skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker won't change and might not work anymore. - To avoid such problems, Subversion clients version 1.5 and + To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_locking.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_locking.xml index c4b63c6..83c3fc4 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_locking.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_locking.xml @@ -9,7 +9,7 @@ readonly - Subversion generally works best without locking, using the + Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement @@ -33,13 +33,13 @@ - Firstly you need to ensure that your Subversion server is upgraded to at + Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated. - How Locking Works in Subversion + How Locking Works in Git By default, nothing is locked and anyone who has commit access can commit changes to any file at any time. Others will update their @@ -58,7 +58,7 @@ out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there - is a new Subversion property + is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only @@ -77,7 +77,7 @@ If one of your co-workers acquires a lock and then goes on holiday - without releasing it, what do you do? Subversion provides a means + without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to @@ -182,7 +182,7 @@ are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. - Subversion doesn't lose data, but you have lost the + Git doesn't lose data, but you have lost the team-working protection that locking gave you. @@ -201,7 +201,7 @@ If you operate a policy where every file has to be locked then - you may find it easier to use Subversion's auto-props feature + you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information. @@ -210,7 +210,7 @@ The Locking Hook Scripts - When you create a new repository with Subversion 1.2 or higher, + When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml index 6cf2da7..9303877 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml @@ -347,7 +347,7 @@ Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries - created by Subversion (shown in the bottom pane). The search + created by Git (shown in the bottom pane). The search is not case sensitive. @@ -499,7 +499,7 @@ Show properties - View the Subversion properties for the selected item. + View the Git properties for the selected item. @@ -538,7 +538,7 @@ to differences. What's the difference? - Subversion uses revision numbers to mean 2 different things. + Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means @@ -549,13 +549,13 @@ If you select two revisions N and M, the context menu will offer to show the difference between those two - revisions. In Subversion terms this is + revisions. In Git terms this is diff -r M:N. If you select a single revision N, the context menu will offer to show the changes made in that revision. - In Subversion terms this is diff -r N-1:N + In Git terms this is diff -r N-1:N or diff -c N. @@ -608,7 +608,7 @@ of the branch does not make sense in that instance. - Note that Subversion currently implements renaming + Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked. @@ -663,7 +663,7 @@ merge tracking log - Subversion 1.5 and later keeps a record of merges using properties. + Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on @@ -703,7 +703,7 @@ revprops - Revision properties are completely different from the Subversion + Revision properties are completely different from the Git properties of each item. Revprops are descriptive items which are associated with one specific revision number in the repository, such as log message, commit date and committer name (author). @@ -716,7 +716,7 @@ authentication or... - Subversion lets you change revision properties any time you want. + Git lets you change revision properties any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change @@ -724,7 +724,7 @@ Hook Scripts - in the Subversion Book for details about how to do that. + in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine. @@ -736,7 +736,7 @@ - Because Subversion's revision properties are not versioned, making + Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that @@ -804,7 +804,7 @@ No Log Formatting from Repository Browser - Because the formatting depends upon accessing subversion + Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_merge.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_merge.xml index 6f278eb..30ff4b1 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_merge.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_merge.xml @@ -13,12 +13,12 @@ It is important to understand how branching and merging works in - Subversion before you start using it, as it can become quite complex. + Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging - in the Subversion book, which gives a full description and many + in the Git book, which gives a full description and many examples of how it is used. @@ -55,7 +55,7 @@ those changes across to a different branch. - What you are asking Subversion to do is this: + What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B). @@ -67,7 +67,7 @@ This method covers the case when you have made a feature branch - as discussed in the Subversion book. All trunk changes have been + as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, @@ -78,7 +78,7 @@ This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of - Subversion to calculate the correct revision ranges to use, + Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since @@ -106,7 +106,7 @@ This is a more general case of the reintegrate method. - What you are asking Subversion to do is: + What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). @@ -121,7 +121,7 @@ vendor branches - in the Subversion Book. + in the Git Book. @@ -177,7 +177,7 @@ If you are merging revisions in chunks, the method - shown in the subversion book will have you merge + shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time. @@ -221,9 +221,9 @@ revision 40. - If you are using the merge tracking features of Subversion, + If you are using the merge tracking features of Git, you do not need to remember which revisions have already been - merged - Subversion will record that for you. If you leave + merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more. @@ -336,13 +336,13 @@ you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they - are logically related, Subversion has no knowledge of this because + are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal - followed by a complete add. To make Subversion use only path-based + followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this - topic in the Subversion book, + topic in the Git book, Noticing or Ignoring Ancestry @@ -392,7 +392,7 @@ Conflicts often arise if the branch has drifted far from the trunk. - For Subversion clients and servers prior to 1.5, no merge information + For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always @@ -406,10 +406,10 @@ Best Practices for Merging - in the Subversion book. + in the Git book. - If your server and all clients are running Subversion 1.5 or higher, + If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know @@ -431,7 +431,7 @@ - Subversion can't merge a file with a folder and vice versa - only + Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, @@ -445,7 +445,7 @@ merge tracking - Subversion 1.5 introduced facilities for merge tracking. When you + Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. @@ -497,8 +497,8 @@ and earlier servers will not provide the information requested by new clients. - Find out more about merge tracking from Subversion's - + Find out more about merge tracking from Git's + Merge tracking documentation . diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_propertypage.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_propertypage.xml index c07dbf1..2118012 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_propertypage.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_propertypage.xml @@ -7,12 +7,12 @@

- Explorer property page, Subversion tab + Explorer property page, Git tab
Sometimes you want to have more detailed information about a file/directory than just the icon overlay. - You can get all the information Subversion provides in the + You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select @@ -22,23 +22,23 @@ in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new - property page for files/folders under Subversion control, + property page for files/folders under Git control, where you can see all relevant information about the selected file/directory. - Subversion Properties + Git Properties - Subversion properties + Git properties
- Subversion property page + Git property page
- You can read and set the Subversion properties + You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGit @@ -52,7 +52,7 @@ You can add your own properties, or some properties with a - special meaning in Subversion. These begin with svn:. + special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in . @@ -65,7 +65,7 @@ expand keywords - Subversion supports CVS-like keyword expansion which can be + Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: @@ -120,13 +120,13 @@ svn:keywords section - in the Subversion book, which gives a full description of these + in the Git book, which gives a full description of these keywords and how to enable and use them. - For more information about properties in Subversion see the + For more information about properties in Git see the Special Properties . @@ -244,24 +244,24 @@ auto-props - You can configure Subversion and TortoiseGit to set properties + You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this. - You can edit the subversion configuration file to enable + You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of - subversion's workings. You need to change two things: + Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. - This method is a standard subversion feature and works with - any subversion client. However it has to be defined on each + This method is a standard Git feature and works with + any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository. @@ -286,7 +286,7 @@ Commit properties - Subversion properties are versioned. After you change or add a + Git properties are versioned. After you change or add a property you have to commit your changes. @@ -294,7 +294,7 @@ Conflicts on properties If there's a conflict on committing the changes, because another - user has changed the same property, Subversion generates a + user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict. @@ -358,14 +358,14 @@ - Subversion allows you to set autoprops which + Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set - appropriate autoprops in their subversion configuration file. + appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. - The format is the same as for subversion autoprops, e.g. + The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension. @@ -494,7 +494,7 @@ Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of - Subversion clients, or possibly have old versions of TortoiseGit, + Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_relocate.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_relocate.xml index c7b594b..156e374 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_relocate.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_relocate.xml @@ -68,7 +68,7 @@ - You want to move to a different Subversion repository. In that case + You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_rename.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_rename.xml index 97de7cf..5215ab0 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_rename.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_rename.xml @@ -3,7 +3,7 @@ Deleting, Moving and Renaming - Unlike CVS, Subversion allows renaming and moving of files and + Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu.
@@ -25,7 +25,7 @@ TortoiseGit Delete - to remove files or folders from subversion. + to remove files or folders from Git. When you @@ -58,7 +58,7 @@ on the folder itself. This difference in behaviour between files and folders - is a part of Subversion, not TortoiseGit. + is a part of Git, not TortoiseGit. If you want to delete an item from the repository, but keep it @@ -76,20 +76,20 @@ instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update - your working copy, Subversion will spot the missing file and + your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGit Delete - so that Subversion doesn't have to guess what + so that Git doesn't have to guess what you really want to do. If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, - Subversion will replace the missing folder with the latest version + Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using @@ -215,7 +215,7 @@ - Making case-only changes to a filename is tricky with Subversion + Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command. @@ -223,7 +223,7 @@ Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it - within subversion. Just renaming in the explorer will corrupt + within Git. Just renaming in the explorer will corrupt your working copy! @@ -281,7 +281,7 @@ but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory - on a Windows client. Whilst Subversion supports case-sensitive + on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not. @@ -310,14 +310,14 @@ Repairing File Renames Sometimes your friendly IDE will rename files for you as part of a refactoring - exercise, and of course it doesn't tell Subversion. If you try to commit your - changes, Subversion will see the old filename as missing and the new one as + exercise, and of course it doesn't tell Git. If you try to commit your + changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, - but you would then lose the history tracing, as Subversion does not know the + but you would then lose the history tracing, as Git does not know the files are related. - A better way is to notify Subversion that this change is actually a rename, + A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) @@ -333,7 +333,7 @@ Deleting Unversioned Files Usually you set your ignore list such that all generated files are ignored - in Subversion. But what if you want to clear all those ignored items to produce + in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_repoviewer.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_repoviewer.xml index 8f8ecee..65501d5 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_repoviewer.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_repoviewer.xml @@ -16,7 +16,7 @@ There are several web-based repository viewers available for use with - Subversion such as + Git such as ViewVC @@ -111,7 +111,7 @@ No Repo Viewer Links from Repository Browser - Because the repo viewer integration depends upon accessing subversion + Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_revgraph.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_revgraph.xml index 53e1cf8..61ebc12 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_revgraph.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_revgraph.xml @@ -385,7 +385,7 @@ - Because Subversion cannot provide all the information required, + Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_aspdotnet.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_aspdotnet.xml index 9713f75..a6f497f 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_aspdotnet.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_aspdotnet.xml @@ -1,7 +1,7 @@ - Subversion Working Folders + Git Working Folders .svn folder @@ -10,8 +10,8 @@ VS.NET 2003 when used with web projects can't handle the .svn - folders that Subversion uses to store its internal information. - This is not a bug in Subversion. The bug is in VS.NET 2003 and the frontpage + folders that Git uses to store its internal information. + This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses. @@ -20,9 +20,9 @@ - As of Version 1.3.0 of Subversion and TortoiseGit, you can set + As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. - If that variable is set, then Subversion will use _svn + If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_general.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_general.xml index 7ec00ab..b52e14e 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_general.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_general.xml @@ -12,7 +12,7 @@
This dialog allows you to specify your preferred language, - and the Subversion-specific settings. + and the Git-specific settings. @@ -88,14 +88,14 @@ Note that the ignore patterns you specify here will also - affect other Subversion clients running on your PC, including + affect other Git clients running on your PC, including the command line client. - If you use the Subversion configuration file to set + If you use the Git configuration file to set a global-ignores pattern, it will - override the settings you make here. The Subversion + override the settings you make here. The Git configuration file is accessed using the Edit as described below. @@ -128,14 +128,14 @@ - Subversion configuration file + Git configuration file Use Edit to edit the - Subversion configuration file directly. + Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. - For more information about the Subversion + For more information about the Git config file see the Runtime Configuration Area @@ -145,7 +145,7 @@ Automatic Property Setting is of particular interest, and that is configured here. - Note that Subversion can read configuration information + Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to @@ -159,13 +159,13 @@ VS.NET when used with web projects can't handle the .svn - folders that Subversion uses to store its internal information. - This is not a bug in Subversion. The bug is in VS.NET and the frontpage + folders that Git uses to store its internal information. + This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue. - If you want to change the behaviour of Subversion and TortoiseGit, + If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this. @@ -309,7 +309,7 @@ Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an - error condition, which occurs when Subversion is unable + error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_hooks.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_hooks.xml index 62084b5..78bd407 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_hooks.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_hooks.xml @@ -16,7 +16,7 @@ This dialog allows you to set up hook scripts which will be - executed automatically when certain Subversion actions are performed. + executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client. @@ -85,7 +85,7 @@ Pre-update - Called before the actual Subversion update begins. + Called before the actual Git update begins. @@ -305,7 +305,7 @@ whether you want them or not ;-) - If you want the Subversion operation to hold off until the hook has completed, + If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_network.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_network.xml index 47ef0fd..9d752b6 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_network.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_network.xml @@ -16,7 +16,7 @@ If you need to set up per-repository proxy settings, you will - need to use the Subversion servers file to + need to use the Git servers file to configure this. Use Edit to get there directly. Consult the @@ -69,7 +69,7 @@ which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under - Subversion/TortoiseGit SSH How-To + Git/TortoiseGit SSH How-To . diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_overlays.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_overlays.xml index cffb4a6..ebd28c7 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_overlays.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_overlays.xml @@ -132,14 +132,14 @@ need the overlays. For example: - f:\development\SVN\Subversion will disable + f:\development\SVN\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder. - f:\development\SVN\Subversion* will disable the + f:\development\SVN\Git* will disable the overlays on all files and folders whose path - starts with f:\development\SVN\Subversion. That + starts with f:\development\SVN\Git. That means you won't see overlays for any files and folders below that path. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_progs.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_progs.xml index 941651c..76c2368 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_progs.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_progs.xml @@ -108,7 +108,7 @@ C:\Path-To\compare.exe /max /wait /title1:%bname /title2:%yname is unchecked then TortoiseGit will skip pre-processing the files. - You can also specify a different diff tool to use on Subversion + You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_registry.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_registry.xml index d9c0ef3..6dbdc4b 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_registry.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_registry.xml @@ -15,7 +15,7 @@ Configuration - You can specify a different location for the Subversion + You can specify a different location for the Git configuration file using registry location HKCU\Software\TortoiseGit\ConfigDir. This will affect all TortoiseGit operations. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_saved.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_saved.xml index 0d6da80..88ab4b9 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_saved.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_settings_saved.xml @@ -67,7 +67,7 @@ Authentication data - When you authenticate with a Subversion server, the username + When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_update.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_update.xml index 1a43b35..1768521 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_update.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_update.xml @@ -172,9 +172,9 @@ Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically - happens when Subversion tries to checkout a newly versioned file, and finds + happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working - folder. Subversion will never overwrite an unversioned file - it might + folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file. diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_wcstatus.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_wcstatus.xml index db6b999..94e3cf0 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_wcstatus.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_wcstatus.xml @@ -31,17 +31,17 @@ - Now that you have checked out a working copy from a Subversion + Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on - the Subversion status of the file the overlay icon is different. + the Git status of the file the overlay icon is different. - + A fresh checked out working copy has a green checkmark as overlay. - That means the Subversion status is normal. + That means the Git status is normal. @@ -59,13 +59,13 @@ If you have set the svn:needs-lock property on a file, - Subversion makes that file read-only until you get a lock on that file. + Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file. - If you hold a lock on a file, and the Subversion status is + If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file. @@ -109,7 +109,7 @@ this has been integrated yet :-) - For a description of how icon overlays correspond to Subversion + For a description of how icon overlays correspond to Git status and other technical details, read . @@ -327,9 +327,9 @@ Repairing External Renames - Sometimes files get renamed outside of Subversion, and they show up + Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid - losing the history you need to notify Subversion about the connection. + losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use diff --git a/doc/source/en/TortoiseGit/tsvn_introduction.xml b/doc/source/en/TortoiseGit/tsvn_introduction.xml index 734d79a..b689193 100644 --- a/doc/source/en/TortoiseGit/tsvn_introduction.xml +++ b/doc/source/en/TortoiseGit/tsvn_introduction.xml @@ -24,14 +24,14 @@ What is TortoiseGit? TortoiseGit is a free open-source client for the - Subversion version control system. + Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. - This is why many people think of Subversion and version control + This is why many people think of Git and version control systems in general as a sort of time machine. @@ -40,7 +40,7 @@ tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for - building software. Subversion, however, is not one of these + building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code. @@ -52,9 +52,9 @@ TortoiseGit's History - In 2002, Tim Kemp found that Subversion was a very good version + In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a - Subversion client as a Windows shell integration was inspired by + Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS. @@ -62,15 +62,15 @@ TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system - and found Subversion and the source for TortoiseGit. Since TortoiseGit + and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained. - As Subversion became more stable it attracted more and more users - who also started using TortoiseGit as their Subversion client. + As Git became more stable it attracted more and more users + who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website @@ -83,7 +83,7 @@ TortoiseGit's Features - What makes TortoiseGit such a good Subversion client? + What makes TortoiseGit such a good Git client? Here's a short list of features. @@ -127,18 +127,18 @@ - Easy access to Subversion commands + Easy access to Git commands - All Subversion commands are available from the explorer + All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there. - Since TortoiseGit is a Subversion client, we would also like to show you - some of the features of Subversion itself: + Since TortoiseGit is a Git client, we would also like to show you + some of the features of Git itself: @@ -146,7 +146,7 @@ CVS only tracks the history of individual files, but - Subversion implements a virtual + Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are @@ -182,16 +182,16 @@ Choice of network layers - Subversion has an abstracted notion of repository + Git has an abstracted notion of repository access, making it easy for people to implement new - network mechanisms. Subversion's advanced + network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. - This gives Subversion a big advantage in stability and + This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, - standalone Subversion server process is also available. + standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh. @@ -201,7 +201,7 @@ Consistent data handling - Subversion expresses file differences using a binary + Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the @@ -215,7 +215,7 @@ The cost of branching and tagging need not be - proportional to the project size. Subversion creates + proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, @@ -227,9 +227,9 @@ Hackability - Subversion has no historical baggage; it is implemented + Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined - APIs. This makes Subversion extremely maintainable and + APIs. This makes Git extremely maintainable and usable by other applications and languages. diff --git a/doc/source/en/TortoiseGit/tsvn_preface.xml b/doc/source/en/TortoiseGit/tsvn_preface.xml index 99a43cd..1b74e99 100644 --- a/doc/source/en/TortoiseGit/tsvn_preface.xml +++ b/doc/source/en/TortoiseGit/tsvn_preface.xml @@ -3,7 +3,7 @@ Preface - + @@ -48,7 +48,7 @@ Audience This book is written for computer literate folk who want to - use Subversion to manage their data, but are uncomfortable using the + use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it. @@ -71,19 +71,19 @@ In we give a short introduction - to the Subversion revision control system which + to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the - Subversion project and explains the different approaches to version - control, and how Subversion works. + Git project and explains the different approaches to version + control, and how Git works. - Even most Subversion users will never have to set up a server themselves. + Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators. The chapter on explains how to set up - a local repository, which is useful for testing Subversion and TortoiseGit + a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server. @@ -94,11 +94,13 @@ modifying it, committing your changes, etc. It then progresses to more advanced topics. + The section answers some common questions about performing tasks which are not explicitly covered elsewhere. @@ -110,7 +112,7 @@ The give a correlation - between TortoiseGit commands and their equivalents in the Subversion + between TortoiseGit commands and their equivalents in the Git command line client svn.exe. @@ -125,17 +127,10 @@ TortoiseGit is an Open Source project. That means you have full - read access to the source code of this program. You can browse it - on this link - - http://TortoiseGit.tigris.org/svn/TortoiseGit/ - . - You will be prompted to enter username and password. - The username is guest, and the password must be left blank. - The most recent version (where we're currently working) is located under - /trunk/, - and the released versions are located under - /tags/. + read access to the source code of this program. Project Home is + + http://code.google.com/p/tortoisegit + @@ -144,7 +139,7 @@ Community - Both TortoiseGit and Subversion are developed by a community of + Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs. @@ -157,7 +152,7 @@ Acknowledgments - Tim Kemp + Frank Li for founding the TortoiseGit project @@ -165,6 +160,35 @@ + Colin Law + + + + + + + myagi + + + + + + + Johan t Hart + + + + + + + Tim Kemp + + + for founding the TortoiseSVN project(TortoiseGit come from this project) + + + + Stefan Küng @@ -190,10 +214,10 @@ - The Subversion Book + The Git Book - for the great introduction to Subversion and its + for the great introduction to Git and its chapter 2 which we copied here diff --git a/doc/source/en/TortoiseGit/tsvn_repository/checkout_links.xml b/doc/source/en/TortoiseGit/tsvn_repository/checkout_links.xml index 5cca01a..15e653c 100644 --- a/doc/source/en/TortoiseGit/tsvn_repository/checkout_links.xml +++ b/doc/source/en/TortoiseGit/tsvn_repository/checkout_links.xml @@ -15,7 +15,7 @@ website - If you want to make your Subversion repository available + If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users. diff --git a/doc/source/en/TortoiseGit/tsvn_repository/repository.xml b/doc/source/en/TortoiseGit/tsvn_repository/repository.xml index 3009292..06ce767 100644 --- a/doc/source/en/TortoiseGit/tsvn_repository/repository.xml +++ b/doc/source/en/TortoiseGit/tsvn_repository/repository.xml @@ -6,10 +6,10 @@ No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done - with the Subversion command line client or with TortoiseGit. + with the Git command line client or with TortoiseGit. - If you haven't created a Subversion repository yet, + If you haven't created a Git repository yet, it's time to do that now. diff --git a/doc/source/en/TortoiseGit/tsvn_repository/repository_backup.xml b/doc/source/en/TortoiseGit/tsvn_repository/repository_backup.xml index d80c594..40bb45a 100644 --- a/doc/source/en/TortoiseGit/tsvn_repository/repository_backup.xml +++ b/doc/source/en/TortoiseGit/tsvn_repository/repository_backup.xml @@ -34,15 +34,15 @@ svnadmin hotcopy path/to/repository path/to/backup --clean-logs The svnadmin tool is installed automatically - when you install the Subversion command line client. If you + when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the - Subversion command line client from - - http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 + Git command line client from + + http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91 . diff --git a/doc/source/en/TortoiseGit/tsvn_repository/repository_create.xml b/doc/source/en/TortoiseGit/tsvn_repository/repository_create.xml index b4e0bf7..6ac8694 100644 --- a/doc/source/en/TortoiseGit/tsvn_repository/repository_create.xml +++ b/doc/source/en/TortoiseGit/tsvn_repository/repository_create.xml @@ -17,7 +17,7 @@ Choosing a Data Store - in the Subversion book for more information. + in the Git book for more information. Creating a Repository with the Command Line Client @@ -138,7 +138,7 @@ svnadmin create --fs-type fsfs MyNewRepository To access your local repository you need the path to that folder. - Just remember that Subversion expects all repository paths in the form + Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout. @@ -185,7 +185,7 @@ svnadmin create --fs-type fsfs MyNewRepository Secondly not all network file sharing protocols support the locking - that Subversion requires, so you may find your repository gets corrupted. + that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time. @@ -267,7 +267,7 @@ svnadmin create --fs-type fsfs MyNewRepository When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps - in the revision numbers. The Subversion and TortoiseGit projects + in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers. diff --git a/doc/source/en/TortoiseGit/tsvn_repository/repository_hooks.xml b/doc/source/en/TortoiseGit/tsvn_repository/repository_hooks.xml index 253b876..3ac3be0 100644 --- a/doc/source/en/TortoiseGit/tsvn_repository/repository_hooks.xml +++ b/doc/source/en/TortoiseGit/tsvn_repository/repository_hooks.xml @@ -23,7 +23,7 @@ Hook Scripts - in the Subversion Book for full details about the hooks which + in the Git Book for full details about the hooks which are implemented. diff --git a/doc/source/en/TortoiseGit/tsvn_server/server.xml b/doc/source/en/TortoiseGit/tsvn_server/server.xml index 7bd5cfe..104415e 100644 --- a/doc/source/en/TortoiseGit/tsvn_server/server.xml +++ b/doc/source/en/TortoiseGit/tsvn_server/server.xml @@ -4,7 +4,7 @@ Setting Up A Server - To use TortoiseGit (or any other Subversion client), you need a place where your + To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or @@ -15,9 +15,9 @@ such a server on a Windows machine. - More detailed information on the Subversion server options, and how + More detailed information on the Git server options, and how to choose the best architecture for your situation, can be - found in the Subversion book under + found in the Git book under Server Configuration . diff --git a/doc/source/en/TortoiseGit/tsvn_server/server_apache.xml b/doc/source/en/TortoiseGit/tsvn_server/server_apache.xml index c883170..f9f6e26 100644 --- a/doc/source/en/TortoiseGit/tsvn_server/server_apache.xml +++ b/doc/source/en/TortoiseGit/tsvn_server/server_apache.xml @@ -8,7 +8,7 @@ Apache - The most flexible of all possible server setups for Subversion + The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot: @@ -20,7 +20,7 @@ WebDAV - The Apache based Subversion server uses the + The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows @@ -35,7 +35,7 @@ You can point your browser to the URL of your repository and browse the contents of it without - having a Subversion client installed. This + having a Git client installed. This gives access to your data to a much wider circle of users. @@ -149,25 +149,25 @@ - Installing Subversion + Installing Git - Download the latest version of the Subversion Win32 binaries for + Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to - - http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100 + + http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100 . - Run the Subversion installer and follow - the instructions. If the Subversion installer recognized + Run the Git installer and follow + the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps. @@ -179,8 +179,8 @@ Using the windows explorer, go to the installation - directory of Subversion (usually - c:\program files\Subversion) + directory of Git (usually + c:\program files\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files @@ -193,7 +193,7 @@ Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from - the Subversion installation directory to the Apache + the Git installation directory to the Apache bin directory. @@ -225,9 +225,9 @@ LoadModule authz_svn_module modules/mod_authz_svn.so Configuration - Now you have set up Apache and Subversion, but Apache doesn't - know how to handle Subversion clients like TortoiseGit yet. - To get Apache to know which URL will be used for Subversion + Now you have set up Apache and Git, but Apache doesn't + know how to handle Git clients like TortoiseGit yet. + To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\program files\apache group\apache2\conf\httpd.conf) @@ -243,13 +243,13 @@ LoadModule authz_svn_module modules/mod_authz_svn.so SVNParentPath D:\SVN #SVNIndexXSLT "/svnindex.xsl" AuthType Basic - AuthName "Subversion repositories" + AuthName "Git repositories" AuthUserFile passwd #AuthzSVNAccessFile svnaccessfile Require valid-user </Location> - This configures Apache so that all your Subversion + This configures Apache so that all your Git repositories are physically located below D:\SVN. The repositories are served to the outside world from the URL: @@ -289,7 +289,7 @@ bin\htpasswd passwd <username> Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the - Subversion repository you created before). If all went + Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository. @@ -320,7 +320,7 @@ bin\htpasswd passwd <username> <Location /svn> - means that the Subversion repositories are available from the URL + means that the Git repositories are available from the URL http://MyServer/svn/ @@ -328,13 +328,13 @@ bin\htpasswd passwd <username> DAV svn tells Apache which module will be responsible to serve - that URL - in this case the Subversion module. + that URL - in this case the Git module. SVNListParentPath on - For Subversion version 1.3 and higher, this directive enables + For Git version 1.3 and higher, this directive enables listing all the available repositories under SVNParentPath. @@ -342,7 +342,7 @@ bin\htpasswd passwd <username> SVNParentPath D:\SVN - tells Subversion to look for repositories below + tells Git to look for repositories below D:\SVN @@ -361,7 +361,7 @@ bin\htpasswd passwd <username> - AuthName "Subversion repositories" + AuthName "Git repositories" is used as an information whenever an authentication dialog pops up to tell the user what the authentication is for @@ -377,7 +377,7 @@ bin\htpasswd passwd <username> AuthzSVNAccessFile Location of the Access file for paths inside a - Subversion repository + Git repository @@ -418,12 +418,12 @@ Require valid-user #AuthzSVNAccessFile svnaccessfile - and create a Subversion access file. Apache will + and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then - pass the username to Subversion's AuthzSVNAccessFile + pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access - based upon rules listed in the Subversion access file. + based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a @@ -478,7 +478,7 @@ Require valid-user If you used the SVNParentPath directive then you don't have to - change the Apache config file every time you add a new Subversion + change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via @@ -491,7 +491,7 @@ Require valid-user and a new project has a home... - If you are using Subversion 1.3 or later, you can use the + If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository. @@ -508,7 +508,7 @@ Require valid-user The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is - available with the Apache server, and as of Subversion 1.3 + available with the Apache server, and as of Git 1.3 it is available with svnserve as well. @@ -615,7 +615,7 @@ LoadModule auth_module modules/mod_auth.so - To make the Subversion location use this + To make the Git location use this type of authentication you have to change the line AuthType Basic @@ -662,7 +662,7 @@ SSPIOfferBasic On - Subversion AuthzSVNAccessFile files are + Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser). @@ -673,7 +673,7 @@ SSPIOfferBasic On This difference can bite you when using SSPI authentication - as the windows domain and user names are passed to Subversion + as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache @@ -690,7 +690,7 @@ SSPIOfferBasic On Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you - determine the username string passed onto Subversion's + determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile @@ -707,7 +707,7 @@ SSPIOfferBasic On It is also possible to have more than one authentication source for - your Subversion repository. To do this, you need to make each + your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password. @@ -738,7 +738,7 @@ SSPIAuthoritative Off SVNListParentPath on SVNParentPath D:\SVN - AuthName "Subversion repositories" + AuthName "Git repositories" AuthzSVNAccessFile svnaccessfile.txt # NT Domain Logins. @@ -866,7 +866,7 @@ bin\openssl x509 -in conf\server.cert -out conf\server.der.crt the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that - problem and TortoiseGit and any other Subversion client are + problem and TortoiseGit and any other Git client are still able to authenticate. @@ -879,7 +879,7 @@ bin\openssl x509 -in conf\server.cert -out conf\server.der.crt directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but - other browsers and Subversion won't be able to + other browsers and Git won't be able to authenticate against that location. @@ -920,7 +920,7 @@ SetEnvIf User-Agent ".*MSIE.*" \ When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. - To do this, you have to add another directive to the Subversion + To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL. @@ -931,7 +931,7 @@ SetEnvIf User-Agent ".*MSIE.*" \ SVNParentPath D:\SVN SSLRequireSSL AuthType Basic - AuthName "Subversion repositories" + AuthName "Git repositories" AuthUserFile passwd #AuthzSVNAccessFile svnaccessfile Require valid-user @@ -949,7 +949,7 @@ SetEnvIf User-Agent ".*MSIE.*" \ In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be - secure with a required client certificate, running a Subversion server. + secure with a required client certificate, running a Git server. Adding an SSLVerifyClient Optional directive to the @@ -963,7 +963,7 @@ SetEnvIf User-Agent ".*MSIE.*" \ The solution is to add the following directive to the virtual host - directory that you want to lock down for Subversion: + directory that you want to lock down for Git: SSLRequire %{SSL_CLIENT_VERIFY} eq "SUCCESS" @@ -983,10 +983,10 @@ SSLVerifyClient Optional </Directory> </VirtualHost> -### Virtual host configuration for SUBVERSION +### Virtual host configuration for Git ### (requiring a client certificate) <VirtualHost 127.0.0.1:443> - <Directory "subversion host root path"> + <Directory "Git host root path"> SSLRequire %{SSL_CLIENT_VERIFY} eq "SUCCESS" </Directory> diff --git a/doc/source/en/TortoiseGit/tsvn_server/server_svn.xml b/doc/source/en/TortoiseGit/tsvn_server/server_svn.xml index f899aa6..5245c33 100644 --- a/doc/source/en/TortoiseGit/tsvn_server/server_svn.xml +++ b/doc/source/en/TortoiseGit/tsvn_server/server_svn.xml @@ -9,7 +9,7 @@ There may be situations where it's not possible to use Apache as - your server. Fortunately, Subversion includes Svnserve + your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection. @@ -25,13 +25,13 @@ - Get the latest version of Subversion from - - http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 + Get the latest version of Git from + + http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91 . Alternatively get a pre-packaged installer from CollabNet at - - http://www.collab.net/downloads/subversion + + http://www.collab.net/downloads/Git . This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security. @@ -39,21 +39,21 @@ - If you already have a version of Subversion installed, and + If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing. - Run the Subversion installer. If you run the installer on + Run the Git installer. If you run the installer on your server (recommended) you can skip step 4. Open the windows-explorer, go to the - installation directory of Subversion (usually - C:\Program Files\Subversion) and in the + installation directory of Git (usually + C:\Program Files\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, @@ -150,7 +150,7 @@ svn://localhost/TestRepo Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run - svnserve as a windows service. Starting with Subversion 1.4, + svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service. @@ -159,21 +159,21 @@ svn://localhost/TestRepo started when windows starts. sc create svnserve binpath= "c:\svnserve\svnserve.exe --service - --root c:\repos" displayname= "Subversion" depend= tcpip + --root c:\repos" displayname= "Git" depend= tcpip start= auto If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: sc create svnserve binpath= " - \"C:\Program Files\Subversion\bin\svnserve.exe\" - --service --root c:\repos" displayname= "Subversion" + \"C:\Program Files\Git\bin\svnserve.exe\" + --service --root c:\repos" displayname= "Git" depend= tcpip start= auto You can also add a description after creating the service. This will show up in the Windows Services Manager. -sc description svnserve "Subversion server (svnserve)" +sc description svnserve "Git server (svnserve)" @@ -196,7 +196,7 @@ sc description svnserve "Subversion server (svnserve)" obj= "NT AUTHORITY\LocalService" Note that you would have to give the Local Service account - appropriate rights to both Subversion and your repositories, + appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called "LOCAL SERVICE". @@ -284,7 +284,7 @@ username = password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information - can be found in the Subversion book, specifically in the + can be found in the Git book, specifically in the sections Create a 'users' file and realm @@ -307,13 +307,13 @@ username = password The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities - to any network protocol, and as of Subversion 1.5 and later, + to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library. For a more complete discussion of the options available, you should - look at the Subversion book in the section + look at the Git book in the section Using svnserve with SASL . @@ -336,7 +336,7 @@ use-sasl = true Second, create a file called svn.conf in a - convenient location - typically in the directory where subversion + convenient location - typically in the directory where Git is installed. @@ -346,7 +346,7 @@ use-sasl = true and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the - Subversion install directory), and ConfFile set + Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you. @@ -442,14 +442,14 @@ max-encryption = 256 Further information about svnserve can be found in the - Version Control with Subversion + Version Control with Git . Path-based Authorization with svnserve - Starting with Subversion 1.3, svnserve supports the same + Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository diff --git a/doc/source/en/TortoiseGit/tsvn_subwcrev.xml b/doc/source/en/TortoiseGit/tsvn_subwcrev.xml index 7ecb530..8b06e8c 100644 --- a/doc/source/en/TortoiseGit/tsvn_subwcrev.xml +++ b/doc/source/en/TortoiseGit/tsvn_subwcrev.xml @@ -17,7 +17,7 @@ SubWCRev is Windows console program which can be used to read - the status of a Subversion working copy and optionally perform + the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you @@ -31,7 +31,7 @@ The SubWCRev Command Line - SubWCRev reads the Subversion status of all files in a working + SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working @@ -345,7 +345,7 @@ char *URL = "http://project.domain.org/svn/trunk/src"; COM SubWCRev interface - If you need to access Subversion revision information from other + If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: diff --git a/doc/source/en/TortoiseMerge/tme_basics.xml b/doc/source/en/TortoiseMerge/tme_basics.xml index 92684cb..927319f 100644 --- a/doc/source/en/TortoiseMerge/tme_basics.xml +++ b/doc/source/en/TortoiseMerge/tme_basics.xml @@ -15,7 +15,7 @@ Editing conflicts between local changes and changes in the - Subversion repository following an update. + Git repository following an update. @@ -96,7 +96,7 @@ Applying Patches - A patch file is a Subversion unified diff file, which contains + A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. diff --git a/doc/source/en/TortoiseMerge/tme_dug_conflicts.xml b/doc/source/en/TortoiseMerge/tme_dug_conflicts.xml index 5a9e708..4080825 100644 --- a/doc/source/en/TortoiseMerge/tme_dug_conflicts.xml +++ b/doc/source/en/TortoiseMerge/tme_dug_conflicts.xml @@ -77,7 +77,7 @@ in the resulting Merged file. - Sometimes a file will be marked as conflicted in Subversion, yet when + Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked diff --git a/doc/source/en/TortoiseMerge/tme_dug_open.xml b/doc/source/en/TortoiseMerge/tme_dug_open.xml index 040d3ef..2eb6060 100644 --- a/doc/source/en/TortoiseMerge/tme_dug_open.xml +++ b/doc/source/en/TortoiseMerge/tme_dug_open.xml @@ -55,7 +55,7 @@ Currently, only patch files in Unified Diff Format are supported. - And only files which were generated from a Subversion + And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported! diff --git a/doc/source/en/TortoiseMerge/tme_dug_settings.xml b/doc/source/en/TortoiseMerge/tme_dug_settings.xml index 7d9fdcd..3d37c73 100644 --- a/doc/source/en/TortoiseMerge/tme_dug_settings.xml +++ b/doc/source/en/TortoiseMerge/tme_dug_settings.xml @@ -39,7 +39,7 @@ Compare whitespaces shows all changes in indentation and inline whitespace as - added/removed lines (which is how Subversion treats such changes). + added/removed lines (which is how Git treats such changes). Ignore whitespace changes diff --git a/doc/source/en/TortoiseMerge/tme_dug_views.xml b/doc/source/en/TortoiseMerge/tme_dug_views.xml index a6b004c..01e72ae 100644 --- a/doc/source/en/TortoiseMerge/tme_dug_views.xml +++ b/doc/source/en/TortoiseMerge/tme_dug_views.xml @@ -93,7 +93,7 @@ get applied directly because you already changed that file. - But don't worry. If you're working with Subversion you can + But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between diff --git a/doc/source/en/TortoiseMerge/tme_introduction.xml b/doc/source/en/TortoiseMerge/tme_introduction.xml index b2cac93..36bd93f 100644 --- a/doc/source/en/TortoiseMerge/tme_introduction.xml +++ b/doc/source/en/TortoiseMerge/tme_introduction.xml @@ -25,7 +25,7 @@ you've made. - If you're working with a version control system (e.g. Subversion) + If you're working with a version control system (e.g. Git) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. @@ -49,7 +49,7 @@ But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like - Subversion. TortoiseMerge parses the patch file for the + Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes @@ -95,7 +95,7 @@ own. That's when TortoiseMerge was born. - Since TortoiseGit already uses the Subversion library, which has a + Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff. diff --git a/doc/source/en/glossary.xml b/doc/source/en/glossary.xml index 76b7b87..684a36d 100644 --- a/doc/source/en/glossary.xml +++ b/doc/source/en/glossary.xml @@ -10,7 +10,7 @@ Add - A Subversion command that is used to add a + A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit. @@ -58,7 +58,7 @@ development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the - unstable trunk. In Subversion a branch is implemented as a + unstable trunk. In Git a branch is implemented as a cheap copy. @@ -67,7 +67,7 @@ Checkout - A Subversion command which creates a local working copy in an empty + A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository. @@ -76,7 +76,7 @@ Cleanup - To quote from the Subversion book: + To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a @@ -93,7 +93,7 @@ Commit - This Subversion command is used to pass the changes in your local + This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision. @@ -105,7 +105,7 @@ When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case - Subversion cannot automatically decide which version to use and + Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes. @@ -115,7 +115,7 @@ Copy - In a Subversion repository you can create a copy of a single file + In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item @@ -158,7 +158,7 @@ FSFS - A proprietary Subversion filesystem backend for repositories. + A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories. @@ -183,7 +183,7 @@ Import - Subversion command to import an entire folder hierarchy into the repository + Git command to import an entire folder hierarchy into the repository in a single revision. @@ -237,7 +237,7 @@ If a working copy has changes to text files only, it is possible - to use Subversion's Diff command to generate a single file summary + to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. @@ -251,10 +251,10 @@ Property - In addition to versioning your directories and files, Subversion allows + In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a - name and a value, rather like a registry key. Subversion has some + name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties @@ -306,7 +306,7 @@ Revert - Subversion keeps a local pristine copy of each file as + Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy. @@ -347,10 +347,10 @@ SVN - A frequently-used abbreviation for Subversion. + A frequently-used abbreviation for Git. - The name of the Subversion custom protocol used by the + The name of the Git custom protocol used by the svnserve repository server. @@ -373,7 +373,7 @@ Update - This Subversion command pulls down the latest changes from the + This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy. diff --git a/doc/test/subwcrev1.txt b/doc/test/subwcrev1.txt index fc4e532..7101470 100644 --- a/doc/test/subwcrev1.txt +++ b/doc/test/subwcrev1.txt @@ -1,14 +1,14 @@ -SubWCRev - A Working Copy Status Tool for Subversion +SubWCRev - A Working Copy Status Tool for Git ------------------------------------------------------ SubWCRev is Windows console program which can be used to read the status -of a Subversion working copy and optionally perform keyword substitution +of a Git working copy and optionally perform keyword substitution in a template file. usage: SubWCRev WorkingCopyPath [SrcVersionFile] [DstVersionFile] [-n|-d] Params: -WorkingCopyPath : path to a Subversion working copy +WorkingCopyPath : path to a Git working copy SrcVersionFile : path to a template header file DstVersionFile : path to where to save the resulting header file -n : if given, then SubWCRev will error if the working @@ -17,7 +17,7 @@ DstVersionFile : path to where to save the resulting header file DstVersionFile does not exist -SubWCRev reads the Subversion status of all files in a working copy, excluding +SubWCRev reads the Git status of all files in a working copy, excluding externals. It records the highest revision number found, and the commit timestamp of that revision, and also whether there are local modifications in the working copy. The revision number and mod status are displayed on stdout. diff --git a/doc/test/subwcrev2.txt b/doc/test/subwcrev2.txt index 2c5cc26..0100a9d 100644 --- a/doc/test/subwcrev2.txt +++ b/doc/test/subwcrev2.txt @@ -1,14 +1,14 @@ -SubWCRev - A Working Copy Status Tool for Subversion +SubWCRev - A Working Copy Status Tool for Git ------------------------------------------------------ SubWCRev is Windows console program which can be used to read the status -of a Subversion working copy and optionally perform keyword substitution +of a Git working copy and optionally perform keyword substitution in a template file. usage: SubWCRev WorkingCopyPath [SrcVersionFile] [DstVersionFile] [-n|-d] Params: -WorkingCopyPath : path to a Subversion working copy +WorkingCopyPath : path to a Git working copy SrcVersionFile : path to a template header file DstVersionFile : path to where to save the resulting header file -n : if given, then SubWCRev will error if the working @@ -17,7 +17,7 @@ DstVersionFile : path to where to save the resulting header file DstVersionFile does not exist -SubWCRev reads the Subversion status of all files in a working copy, excluding +SubWCRev reads the Git status of all files in a working copy, excluding externals. It records the highest revision number found, and the commit timestamp of that revision, and also whether there are local modifications in the working copy. The revision number and mod status are displayed on stdout. diff --git a/doc/test/subwcrev3.txt b/doc/test/subwcrev3.txt index 16f3951..ba0608d 100644 --- a/doc/test/subwcrev3.txt +++ b/doc/test/subwcrev3.txt @@ -1,14 +1,14 @@ -SubWCRev - A Working Copy Status Tool for Subversion +SubWCRev - A Working Copy Status Tool for Git ------------------------------------------------------ SubWCRev is Windows console program which can be used to read the status -of a Subversion working copy and optionally perform keyword substitution +of a Git working copy and optionally perform keyword substitution in a template file. usage: SubWCRev WorkingCopyPath [SrcVersionFile] [DstVersionFile] [-n|-d] Params: -WorkingCopyPath : path to a Subversion working copy +WorkingCopyPath : path to a Git working copy SrcVersionFile : path to a template header file DstVersionFile : path to where to save the resulting header file -n : if given, then SubWCRev will error if the working @@ -17,7 +17,7 @@ DstVersionFile : path to where to save the resulting header file DstVersionFile does not exist -SubWCRev reads the Subversion status of all files in a working copy, excluding +SubWCRev reads the Git status of all files in a working copy, excluding externals. It records the highest revision number found, and the commit timestamp of that revision, and also whether there are local modifications in the working copy. The revision number and mod status are displayed on stdout.