From 9b031455ca24a54dc84f855ed7385f1bf035921f Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Mon, 31 Dec 2012 00:39:16 +0100
Subject: [PATCH] Updated Tortoise.pot

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 Languages/Tortoise.pot | 568 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 429 insertions(+), 139 deletions(-)

diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot
index fe6be6132..4c8b0002a 100644
--- a/Languages/Tortoise.pot
+++ b/Languages/Tortoise.pot
@@ -260,6 +260,11 @@ msgstr ""
 msgid "%s\n%s"
 msgstr ""
 
+#. Resource IDs: (376)
+#, c-format
+msgid "%s\nCould not be cleanly patched."
+msgstr ""
+
 #. Resource IDs: (145)
 #, c-format
 msgid "%s\nDo you want to remove it anyway?"
@@ -282,10 +287,6 @@ msgstr ""
 msgid "&About TortoiseGitBlame..."
 msgstr ""
 
-#. Resource IDs: (57664)
-msgid "&About TortoiseGitMerge..."
-msgstr ""
-
 #. Resource IDs: (16920)
 msgid "&Activate"
 msgstr ""
@@ -482,10 +483,6 @@ msgstr ""
 msgid "&Compare revisions"
 msgstr ""
 
-#. Resource IDs: (1019)
-msgid "&Compare whitespaces"
-msgstr ""
-
 #. Resource IDs: (1239)
 msgid "&Configure"
 msgstr ""
@@ -646,10 +643,6 @@ msgstr ""
 msgid "&Git Style Commit (--rmdir)"
 msgstr ""
 
-#. Resource IDs: (32884)
-msgid "&Go to"
-msgstr ""
-
 #. Resource IDs: (220)
 msgid "&Go to\tCtrl+G"
 msgstr ""
@@ -687,10 +680,6 @@ msgstr ""
 msgid "&Ignore %d items by name"
 msgstr ""
 
-#. Resource IDs: (1021)
-msgid "&Ignore whitespace changes"
-msgstr ""
-
 #. Resource IDs: (16914)
 msgid "&Image"
 msgstr ""
@@ -715,10 +704,6 @@ msgstr ""
 msgid "&Initialize submodules (--init)"
 msgstr ""
 
-#. Resource IDs: (32825)
-msgid "&Inline diff word-wise"
-msgstr ""
-
 #. Resource IDs: (81)
 msgid "&Install"
 msgstr ""
@@ -751,6 +736,15 @@ msgstr ""
 msgid "&Limit search to modified lines"
 msgstr ""
 
+#. Resource IDs: (1078)
+msgid "&Line number"
+msgstr ""
+
+#. Resource IDs: (88)
+#, c-format
+msgid "&Line number (%d - %d)"
+msgstr ""
+
 #. Resource IDs: (32797)
 msgid "&Link image positions"
 msgstr ""
@@ -771,6 +765,10 @@ msgstr ""
 msgid "&Luminence:"
 msgstr ""
 
+#. Resource IDs: (65535)
+msgid "&Max line length for inline diffs"
+msgstr ""
+
 #. Resource IDs: (16543)
 msgid "&Menu animations:"
 msgstr ""
@@ -807,10 +805,6 @@ msgstr ""
 msgid "&Name:"
 msgstr ""
 
-#. Resource IDs: (65535)
-msgid "&Navigate"
-msgstr ""
-
 #. Resource IDs: (1049)
 msgid "&Network drives"
 msgstr ""
@@ -828,10 +822,6 @@ msgstr ""
 msgid "&Next %ld"
 msgstr ""
 
-#. Resource IDs: (32779)
-msgid "&Next Difference"
-msgstr ""
-
 #. Resource IDs: (58114)
 msgid "&Next Page"
 msgstr ""
@@ -892,10 +882,6 @@ msgstr ""
 msgid "&Port:"
 msgstr ""
 
-#. Resource IDs: (32780)
-msgid "&Previous Difference"
-msgstr ""
-
 #. Resource IDs: (1069)
 msgid "&Print Preview"
 msgstr ""
@@ -1120,10 +1106,6 @@ msgstr ""
 msgid "&Timeout in seconds to stop the auto-completion parsing"
 msgstr ""
 
-#. Resource IDs: (59392)
-msgid "&Toolbar"
-msgstr ""
-
 #. Resource IDs: (65535)
 msgid "&Toolbar Name:"
 msgstr ""
@@ -1208,10 +1190,6 @@ msgstr ""
 msgid "&Warn on missing Signed-Off-By on commit"
 msgstr ""
 
-#. Resource IDs: (32774)
-msgid "&Whitespaces"
-msgstr ""
-
 #. Resource IDs: (1203)
 msgid "&Whole Project"
 msgstr ""
@@ -1249,6 +1227,14 @@ msgstr ""
 msgid "(not found)"
 msgstr ""
 
+#. Resource IDs: (176)
+msgid "(properties only)"
+msgstr ""
+
+#. Resource IDs: (176)
+msgid "(props and content)"
+msgstr ""
+
 #. Resource IDs: (245)
 msgid "(unknown)"
 msgstr ""
@@ -1455,6 +1441,10 @@ msgstr ""
 msgid "Abort"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "About"
+msgstr ""
+
 #. Resource IDs: (129)
 msgid "About TortoiseGit"
 msgstr ""
@@ -1526,6 +1516,10 @@ msgstr ""
 msgid "Add extension specific merge program"
 msgstr ""
 
+#. Resource IDs: (1065)
+msgid "Add new files automatically to Git"
+msgstr ""
+
 #. Resource IDs: (13)
 msgid "Add to &ignore list"
 msgstr ""
@@ -1710,6 +1704,10 @@ msgstr ""
 msgid "Apply unified diff"
 msgstr ""
 
+#. Resource IDs: (156, 626)
+msgid "Aqua Style"
+msgstr ""
+
 #. Resource IDs: (65535)
 msgid "Arabic"
 msgstr ""
@@ -1952,6 +1950,10 @@ msgstr ""
 msgid "BlAMEPOPUP"
 msgstr ""
 
+#. Resource IDs: (156, 626)
+msgid "Black Style"
+msgstr ""
+
 #. Resource IDs: (1252)
 msgid "Blame"
 msgstr ""
@@ -1972,6 +1974,10 @@ msgstr ""
 msgid "Blend alpha"
 msgstr ""
 
+#. Resource IDs: (156, 626)
+msgid "Blue Style"
+msgstr ""
+
 #. Resource IDs: (1)
 msgid "Body"
 msgstr ""
@@ -1980,6 +1986,10 @@ msgstr ""
 msgid "Both /logmsg and /logmsgfile were specified!\nOnly one of those can be specified."
 msgstr ""
 
+#. Resource IDs: (70)
+msgid "Both the path to the patch file and the target path must be absolute paths!"
+msgstr ""
+
 #. Resource IDs: (1007)
 msgid "Br&owse..."
 msgstr ""
@@ -2167,6 +2177,10 @@ msgstr ""
 msgid "Change the printing options\nPage Setup"
 msgstr ""
 
+#. Resource IDs: (626)
+msgid "Change the style of the application\nChange Style"
+msgstr ""
+
 #. Resource IDs: (3825)
 msgid "Change the window position"
 msgstr ""
@@ -2198,6 +2212,10 @@ msgstr ""
 msgid "Changes made (double-click on file for diff):"
 msgstr ""
 
+#. Resource IDs: (2060)
+msgid "Changes the style of the application"
+msgstr ""
+
 #. Resource IDs: (3887)
 msgid "Check"
 msgstr ""
@@ -2354,6 +2372,10 @@ msgstr ""
 msgid "Click on \"Advanced\" to specify alternate merge programs based on file extension"
 msgstr ""
 
+#. Resource IDs: (2058)
+msgid "Click to see commands to move blocks of text\nUse text blocks"
+msgstr ""
+
 #. Resource IDs: (257)
 msgid "Clipboard"
 msgstr ""
@@ -2402,12 +2424,16 @@ msgstr ""
 msgid "Close the active window and prompts to save the documents"
 msgstr ""
 
-#. Resource IDs: (16662)
-msgid "Color"
+#. Resource IDs: (156)
+msgid "Collapse"
 msgstr ""
 
-#. Resource IDs: (1068)
-msgid "Color co&de in-line changes"
+#. Resource IDs: (2055)
+msgid "Collapse unchanged sections\nCollapse"
+msgstr ""
+
+#. Resource IDs: (16662)
+msgid "Color"
 msgstr ""
 
 #. Resource IDs: (138, 16961, 65535)
@@ -2531,6 +2557,10 @@ msgstr ""
 msgid "Compare two files"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Compare whitespaces"
+msgstr ""
+
 #. Resource IDs: (1251)
 msgid "Compare with &working tree"
 msgstr ""
@@ -2543,6 +2573,10 @@ msgstr ""
 msgid "Compare with previous revision"
 msgstr ""
 
+#. Resource IDs: (2055)
+msgid "Compares all whitespaces when diffing\nCompare whitespaces"
+msgstr ""
+
 #. Resource IDs: (12)
 msgid "Compares the file with the last committed revision to show you the changes you made"
 msgstr ""
@@ -2782,6 +2816,11 @@ msgstr ""
 msgid "Could not start TortoiseGitBlame"
 msgstr ""
 
+#. Resource IDs: (70)
+#, c-format
+msgid "Could not start diff viewer!\n%s"
+msgstr ""
+
 #. Resource IDs: (81)
 #, c-format
 msgid "Could not start diff viewer!\n\n%s"
@@ -2803,6 +2842,11 @@ msgstr ""
 
 #. Resource IDs: (83)
 #, c-format
+msgid "Could not start text viewer!\n%s"
+msgstr ""
+
+#. Resource IDs: (83)
+#, c-format
 msgid "Could not start text viewer!\n\n%s"
 msgstr ""
 
@@ -2866,6 +2910,10 @@ msgstr ""
 msgid "Create a shallow clone with a history truncated to the specified number of revisions. A shallow repository has a number of limitations (you cannot clone or fetch from it, nor push from nor into it), but is adequate if you are only interested in the recent history of a large project with a long history, and would want to send in fixes as patches."
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Create patch file"
+msgstr ""
+
 #. Resource IDs: (72)
 msgid "Create pull &request"
 msgstr ""
@@ -2874,10 +2922,6 @@ msgstr ""
 msgid "Create repositor&y here..."
 msgstr ""
 
-#. Resource IDs: (32828)
-msgid "Create unified diff file"
-msgstr ""
-
 #. Resource IDs: (85)
 msgid "Created"
 msgstr ""
@@ -3133,6 +3177,10 @@ msgstr ""
 msgid "Destination disk drive is full."
 msgstr ""
 
+#. Resource IDs: (2056)
+msgid "Detect and highlight moved blocks"
+msgstr ""
+
 #. Resource IDs: (3849)
 msgid "Device Independent Bitmap\na device independent bitmap"
 msgstr ""
@@ -3290,6 +3338,11 @@ msgstr ""
 msgid "Do you want to fetch remote branches from the newly added remote?"
 msgstr ""
 
+#. Resource IDs: (319)
+#, c-format
+msgid "Do you want to mark the file\n%s\nas resolved?"
+msgstr ""
+
 #. Resource IDs: (3887)
 msgid "Do you want to recover these auto-saved documents?"
 msgstr ""
@@ -3314,6 +3367,10 @@ msgstr ""
 msgid "Document :"
 msgstr ""
 
+#. Resource IDs: (564)
+msgid "Don't ask me again"
+msgstr ""
+
 #. Resource IDs: (75)
 #, c-format
 msgid "Don't know what will push because unknown branch \"%s\""
@@ -3331,6 +3388,10 @@ msgstr ""
 msgid "Don't show this message again"
 msgstr ""
 
+#. Resource IDs: (564)
+msgid "Don't tell me again"
+msgstr ""
+
 #. Resource IDs: (66, 602)
 msgid "Done"
 msgstr ""
@@ -3628,6 +3689,10 @@ msgstr ""
 msgid "Existing"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Exit"
+msgstr ""
+
 #. Resource IDs: (1002)
 #, c-format
 msgid "Expand (%s)"
@@ -4216,6 +4281,10 @@ msgstr ""
 msgid "Git::Remote"
 msgstr ""
 
+#. Resource IDs: (155)
+msgid "Go To Line"
+msgstr ""
+
 #. Resource IDs: (221)
 msgid "Go to line"
 msgstr ""
@@ -4228,6 +4297,10 @@ msgstr ""
 msgid "Go to the next difference\nNext difference"
 msgstr ""
 
+#. Resource IDs: (2055)
+msgid "Go to the next inline difference\nNext inline difference"
+msgstr ""
+
 #. Resource IDs: (2051)
 msgid "Go to the previous conflict\nPrevious conflict"
 msgstr ""
@@ -4236,6 +4309,14 @@ msgstr ""
 msgid "Go to the previous difference\nPrevious difference"
 msgstr ""
 
+#. Resource IDs: (2055)
+msgid "Go to the previous inline difference\nPrevious inline difference"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Goto Line"
+msgstr ""
+
 #. Resource IDs: (1251)
 msgid "Graph"
 msgstr ""
@@ -4308,6 +4389,10 @@ msgstr ""
 msgid "Hide the script while running"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Hide/Show the patch file list"
+msgstr ""
+
 #. Resource IDs: (2052)
 msgid "Hide/Show the patch file list\nHides or shows the patch file list"
 msgstr ""
@@ -4392,6 +4477,10 @@ msgstr ""
 msgid "ID:32810:V   +T"
 msgstr ""
 
+#. Accelerator Entry for Menu ID:32811; ''
+msgid "ID:32811:V C +U"
+msgstr ""
+
 #. Accelerator Entry for Menu ID:32822; ''
 msgid "ID:32822:V C +F"
 msgstr ""
@@ -4408,12 +4497,20 @@ msgstr ""
 msgid "ID:32837:VA  +M"
 msgstr ""
 
+#. Accelerator Entry for Menu ID:32870; ''
+msgid "ID:32870:V C +L"
+msgstr ""
+
+#. Accelerator Entry for Menu ID:32881; ''
+msgid "ID:32881:V C +P"
+msgstr ""
+
 #. Accelerator Entry for Menu ID:32883; ''
 msgid "ID:32883:V C +A"
 msgstr ""
 
-#. Accelerator Entry for Menu ID:32884; '&Go to'
-msgid "ID:32884:V C +G"
+#. Accelerator Entry for Menu ID:32893; ''
+msgid "ID:32893:V C +G"
 msgstr ""
 
 #. Accelerator Entry for Menu ID:57601; '&Open'
@@ -4458,6 +4555,10 @@ msgstr ""
 msgid "ID:57665:V C +Q"
 msgstr ""
 
+#. Accelerator Entry for Menu ID:57665; ''
+msgid "ID:57665:V C +W"
+msgstr ""
+
 #. Resource IDs: (5029)
 msgid "ISO 8859-1"
 msgstr ""
@@ -4583,14 +4684,6 @@ msgstr ""
 msgid "Ignore %d items by &extension"
 msgstr ""
 
-#. Resource IDs: (1020)
-msgid "Ignore &all whitespaces"
-msgstr ""
-
-#. Resource IDs: (1067)
-msgid "Ignore &case changes"
-msgstr ""
-
 #. Resource IDs: (1692)
 msgid "Ignore File"
 msgstr ""
@@ -4599,6 +4692,18 @@ msgstr ""
 msgid "Ignore Type"
 msgstr ""
 
+#. Resource IDs: (564)
+msgid "Ignore all"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Ignore all whitespace changes"
+msgstr ""
+
+#. Resource IDs: (1067)
+msgid "Ignore case cha&nges"
+msgstr ""
+
 #. Resource IDs: (1687)
 msgid "Ignore item(s) only in the containing folder(s)"
 msgstr ""
@@ -4611,6 +4716,10 @@ msgstr ""
 msgid "Ignore line &endings (recommended)"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Ignore whitespace changes"
+msgstr ""
+
 #. Resource IDs: (1432)
 msgid "Ignored"
 msgstr ""
@@ -4619,6 +4728,14 @@ msgstr ""
 msgid "Ignored Files"
 msgstr ""
 
+#. Resource IDs: (2055)
+msgid "Ignores all whitespace changes when diffing\nIgnore all whitespace changes"
+msgstr ""
+
+#. Resource IDs: (2055)
+msgid "Ignores changes in whitespaces when diffing\nIgnore whitespace changes"
+msgstr ""
+
 #. Resource IDs: (16916)
 msgid "Image &and Text"
 msgstr ""
@@ -4689,6 +4806,14 @@ msgstr ""
 msgid "Initial import"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Inline diff"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Inline diff word-wise"
+msgstr ""
+
 #. Resource IDs: (65535)
 msgid "Inline differences"
 msgstr ""
@@ -4721,6 +4846,10 @@ msgstr ""
 msgid "It is not possible to rename a file by changing the case of its name alone.\nFor example, you can't make MyFile.txt become MYFILE.txt.\nPlease consult the documentation for a way to work around this limitation."
 msgstr ""
 
+#. Resource IDs: (1074)
+msgid "J&ump to first conflict when loading"
+msgstr ""
+
 #. Resource IDs: (65535)
 msgid "Japanese"
 msgstr ""
@@ -4837,14 +4966,20 @@ msgstr ""
 msgid "Line Tool\nLine"
 msgstr ""
 
-#. Resource IDs: (32853)
-msgid "Line diff bar"
-msgstr ""
-
 #. Resource IDs: (65535)
 msgid "Line differences"
 msgstr ""
 
+#. Resource IDs: (176)
+#, c-format
+msgid "Line moved from line %ld"
+msgstr ""
+
+#. Resource IDs: (176)
+#, c-format
+msgid "Line moved to line %ld"
+msgstr ""
+
 #. Resource IDs: (65535)
 msgid "Line:"
 msgstr ""
@@ -4902,10 +5037,6 @@ msgstr ""
 msgid "Location where the contents of the\nrepository URL will be saved to."
 msgstr ""
 
-#. Resource IDs: (32854)
-msgid "Locator Bar"
-msgstr ""
-
 #. Resource IDs: (65)
 msgid "Log"
 msgstr ""
@@ -4980,6 +5111,10 @@ msgstr ""
 msgid "Mail system DLL is invalid."
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Main"
+msgstr ""
+
 #. Resource IDs: (1653)
 msgid "Make it Bare (No working directories)"
 msgstr ""
@@ -4996,10 +5131,6 @@ msgstr ""
 msgid "Manage Remotes"
 msgstr ""
 
-#. Resource IDs: (32808)
-msgid "Mark as &resolved"
-msgstr ""
-
 #. Resource IDs: (282)
 msgid "Mark as resolved"
 msgstr ""
@@ -5216,6 +5347,14 @@ msgstr ""
 msgid "Move: New name for %s"
 msgstr ""
 
+#. Resource IDs: (65535)
+msgid "Moved from"
+msgstr ""
+
+#. Resource IDs: (65535)
+msgid "Moved to"
+msgstr ""
+
 #. Resource IDs: (197)
 msgid "Moves the modified files to the recycle bin first before reverting"
 msgstr ""
@@ -5237,10 +5376,6 @@ msgstr ""
 msgid "My file:"
 msgstr ""
 
-#. Resource IDs: (32804)
-msgid "N&ext Conflict"
-msgstr ""
-
 #. Resource IDs: (3697)
 msgid "NUM"
 msgstr ""
@@ -5253,6 +5388,14 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Navigate"
+msgstr ""
+
+#. Resource IDs: (2056)
+msgid "Navigate to a specific line in the view\nGoto Line"
+msgstr ""
+
 #. Resource IDs: (17004)
 msgid "Navigation Pane Options"
 msgstr ""
@@ -5314,6 +5457,18 @@ msgstr ""
 msgid "Next Page\nNext Page"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Next conflict"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Next difference"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Next inline difference"
+msgstr ""
+
 #. Resource IDs: (73)
 msgid "No"
 msgstr ""
@@ -5342,6 +5497,10 @@ msgstr ""
 msgid "No command value specified!"
 msgstr ""
 
+#. Resource IDs: (87)
+msgid "No differences found!"
+msgstr ""
+
 #. Resource IDs: (82)
 msgid "No differences found! Submodule may not be updated. Update submodule now?"
 msgstr ""
@@ -5403,6 +5562,10 @@ msgstr ""
 msgid "No thesaurus suggestions"
 msgstr ""
 
+#. Resource IDs: (564)
+msgid "No to all"
+msgstr ""
+
 #. Resource IDs: (65)
 msgid "No working directory found."
 msgstr ""
@@ -5589,6 +5752,14 @@ msgstr ""
 msgid "Office 200&7"
 msgstr ""
 
+#. Resource IDs: (156, 626)
+msgid "Office 2003"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Office 2007"
+msgstr ""
+
 #. Resource IDs: (218)
 msgid "Office 2007 (&Aqua Style)"
 msgstr ""
@@ -5605,6 +5776,14 @@ msgstr ""
 msgid "Office 2007 (B&lack Style)"
 msgstr ""
 
+#. Resource IDs: (626)
+msgid "Office 2007 colors"
+msgstr ""
+
+#. Resource IDs: (156, 626)
+msgid "Office XP"
+msgstr ""
+
 #. Resource IDs: (605)
 msgid "Older commit time"
 msgstr ""
@@ -5654,7 +5833,7 @@ msgid "Open an existing document\nOpen"
 msgstr ""
 
 #. Resource IDs: (3601)
-msgid "Open file"
+msgid "Open files for diff or to apply a patch\nOpen files"
 msgstr ""
 
 #. Resource IDs: (1132)
@@ -5729,10 +5908,6 @@ msgstr ""
 msgid "Override branch if exists"
 msgstr ""
 
-#. Resource IDs: (32802)
-msgid "P&revious Conflict"
-msgstr ""
-
 #. Resource IDs: (3845)
 #, c-format
 msgid "Page %u"
@@ -5788,6 +5963,10 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Paste"
+msgstr ""
+
 #. Resource IDs: (603)
 msgid "Paste Recent Message..."
 msgstr ""
@@ -5825,17 +6004,26 @@ msgid "Patch As Attachment"
 msgstr ""
 
 #. Resource IDs: (376)
-msgid "Patch all"
+msgid "Patch all files"
 msgstr ""
 
 #. Resource IDs: (376)
-msgid "Patch selected"
+msgid "Patch selected files"
 msgstr ""
 
 #. Resource IDs: (157)
 msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||"
 msgstr ""
 
+#. Resource IDs: (169)
+msgid "Patching"
+msgstr ""
+
+#. Resource IDs: (169)
+#, c-format
+msgid "Patching file '%s'"
+msgstr ""
+
 #. Resource IDs: (63, 77, 198, 207)
 msgid "Path"
 msgstr ""
@@ -5989,6 +6177,18 @@ msgstr ""
 msgid "Previous Version"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Previous conflict"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Previous difference"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Previous inline difference"
+msgstr ""
+
 #. Resource IDs: (1069, 16990)
 msgid "Print"
 msgstr ""
@@ -6268,6 +6468,11 @@ msgstr ""
 msgid "Regular expressions filter:\r\n.   : any character\r\nc+   : match character c one or more times\r\nc*   : match character c zero or more times\r\n^   : start of line\r\n$   : end of line\r\n(string){n} : match string n times\r\n(abcd)   : subexpression\r\n[aei0-9]   : match a,e,i and 0..9\r\n[^aei0-9] : anything but a,e,i and 0..9\r\n\r\n\\w   : matches a-z,A-Z,0-9 and _\r\n\\W   : any non-alphanumeric character\r\n\\d   : digits 0-9\r\n\\s   : whitespaces"
 msgstr ""
 
+#. Resource IDs: (7)
+#, c-format
+msgid "Rejected patch hunks for '%s'"
+msgstr ""
+
 #. Resource IDs: (1072)
 msgid "Relative Times in log"
 msgstr ""
@@ -6436,6 +6641,10 @@ msgstr ""
 msgid "Replacing"
 msgstr ""
 
+#. Resource IDs: (564)
+msgid "Report"
+msgstr ""
+
 #. Resource IDs: (1618)
 msgid "Repository &URL"
 msgstr ""
@@ -6581,10 +6790,6 @@ msgstr ""
 msgid "Reverts an addition to version control"
 msgstr ""
 
-#. Resource IDs: (376)
-msgid "Review Patch"
-msgstr ""
-
 #. Resource IDs: (603)
 msgid "Review Patch with TortoiseGitMerge"
 msgstr ""
@@ -6681,10 +6886,6 @@ msgstr ""
 msgid "S&elect..."
 msgstr ""
 
-#. Resource IDs: (32782)
-msgid "S&ettings"
-msgstr ""
-
 #. Resource IDs: (1065)
 msgid "S&how Buttons on One Row"
 msgstr ""
@@ -6753,8 +6954,8 @@ msgstr ""
 msgid "Same commit time"
 msgstr ""
 
-#. Resource IDs: (57604)
-msgid "Save &As..."
+#. Resource IDs: (156)
+msgid "Save"
 msgstr ""
 
 #. Resource IDs: (101)
@@ -6765,6 +6966,10 @@ msgstr ""
 msgid "Save As"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Save as"
+msgstr ""
+
 #. Resource IDs: (1567)
 msgid "Save as &Global"
 msgstr ""
@@ -6839,6 +7044,10 @@ msgstr ""
 msgid "Search for:"
 msgstr ""
 
+#. Resource IDs: (169)
+msgid "Searching for better path to apply patch..."
+msgstr ""
+
 #. Resource IDs: (3867)
 #, c-format
 msgid "Seek failed on %1"
@@ -6888,10 +7097,6 @@ msgstr ""
 msgid "Select diff application"
 msgstr ""
 
-#. Resource IDs: (313)
-msgid "Select diff file..."
-msgstr ""
-
 #. Resource IDs: (64)
 msgid "Select folder to associate with this issue tracker"
 msgstr ""
@@ -6924,6 +7129,14 @@ msgstr ""
 msgid "Select merge target"
 msgstr ""
 
+#. Resource IDs: (13)
+msgid "Select patch file..."
+msgstr ""
+
+#. Resource IDs: (79)
+msgid "Select text editor application"
+msgstr ""
+
 #. Resource IDs: (79)
 msgid "Select the behaviour of the progress dialog at the end of the operation."
 msgstr ""
@@ -7104,10 +7317,6 @@ msgstr ""
 msgid "Show Fewer Buttons"
 msgstr ""
 
-#. Resource IDs: (32817)
-msgid "Show File List"
-msgstr ""
-
 #. Resource IDs: (2051)
 msgid "Show HEAD revision nodes"
 msgstr ""
@@ -7116,6 +7325,10 @@ msgstr ""
 msgid "Show Inline-Diff word by word\nInline diff word-wise"
 msgstr ""
 
+#. Resource IDs: (2056)
+msgid "Show Inline-Diff\nInline diff"
+msgstr ""
+
 #. Resource IDs: (32781)
 msgid "Show Log"
 msgstr ""
@@ -7136,6 +7349,10 @@ msgstr ""
 msgid "Show Screen&Tips on toolbars"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Show Whitespaces"
+msgstr ""
+
 #. Resource IDs: (115)
 msgid "Show Whole Project"
 msgstr ""
@@ -7249,7 +7466,7 @@ msgid "Show shortcut &keys in ScreenTips"
 msgstr ""
 
 #. Resource IDs: (2049)
-msgid "Show special characters for whitespaces\nShow Whitespaces"
+msgid "Show special characters for whitespaces and newlines\nShow Whitespaces"
 msgstr ""
 
 #. Resource IDs: (1730)
@@ -7306,12 +7523,12 @@ msgstr ""
 msgid "Si&gn"
 msgstr ""
 
-#. Resource IDs: (1532)
-msgid "Since"
+#. Resource IDs: (156, 626)
+msgid "Silver Style"
 msgstr ""
 
-#. Resource IDs: (32775)
-msgid "Single/&double-pane view"
+#. Resource IDs: (1532)
+msgid "Since"
 msgstr ""
 
 #. Resource IDs: (74)
@@ -7327,6 +7544,10 @@ msgstr ""
 msgid "Skip Patch: %s"
 msgstr ""
 
+#. Resource IDs: (564)
+msgid "Skip all"
+msgstr ""
+
 #. Resource IDs: (11029)
 msgid "Skip worktree"
 msgstr ""
@@ -7351,6 +7572,14 @@ msgstr ""
 msgid "Soft: Leave working tree and index untouched"
 msgstr ""
 
+#. Resource IDs: (314)
+msgid "Some file(s) have been changed outside TortoiseGitMerge.\nDo you want to load the changes?"
+msgstr ""
+
+#. Resource IDs: (314)
+msgid "Some file(s) have been changed outside TortoiseGitMerge.\nWould you like to reload and lose your changes?"
+msgstr ""
+
 #. Resource IDs: (1126)
 msgid "Sort by commit count"
 msgstr ""
@@ -7483,6 +7712,10 @@ msgstr ""
 msgid "Stops bisect mode"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Style"
+msgstr ""
+
 #. Resource IDs: (1639)
 msgid "SubModule"
 msgstr ""
@@ -7552,10 +7785,6 @@ msgstr ""
 msgid "Switch %s to %s, Revision %s"
 msgstr ""
 
-#. Resource IDs: (32811)
-msgid "Switch Left<->Right"
-msgstr ""
-
 #. Resource IDs: (1522)
 msgid "Switch To"
 msgstr ""
@@ -7564,10 +7793,18 @@ msgstr ""
 msgid "Switch back to the previous window pane\nPrevious Pane"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Switch between single and double pane view"
+msgstr ""
+
 #. Resource IDs: (2049)
 msgid "Switch between single and double pane view\nSwitch between single and double pane view"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Switch left and right view"
+msgstr ""
+
 #. Resource IDs: (2051)
 msgid "Switch the contents of the left and right view\nSwitch left and right view"
 msgstr ""
@@ -7751,7 +7988,7 @@ msgstr ""
 
 #. Resource IDs: (69)
 #, c-format
-msgid "The file\n%s\nis not a valid text file!\nNote that UTF32 files are treated as binary too."
+msgid "The file\n%s\nis not a valid text file!"
 msgstr ""
 
 #. Resource IDs: (145)
@@ -7800,6 +8037,11 @@ msgstr ""
 msgid "The line indicating the old file was expected in line %d !"
 msgstr ""
 
+#. Resource IDs: (88)
+#, c-format
+msgid "The line number must be in between %d and %d"
+msgstr ""
+
 #. Resource IDs: (86)
 #, c-format
 msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"."
@@ -7840,17 +8082,17 @@ msgstr ""
 
 #. Resource IDs: (314)
 #, c-format
-msgid "The path\n<i>%s</i>\nin the patchfile does not exist.\nTortoiseGitMerge found the relative path\n<i>%s</i>\nwhich seems to match the directory you're applying the patch.\n\nDo you want to use the suggested path? Answering 'no' will quit TortoiseGitMerge."
+msgid "The path\n%s\nin the patchfile does not exist.\nTortoiseGitMerge found the relative path\n%s\nwhich seems to match the directory you're applying the patch.\n\nDo you want to use the suggested path? Answering 'no' will quit TortoiseGitMerge."
 msgstr ""
 
 #. Resource IDs: (314)
 #, c-format
-msgid "The path\n<i>%s</i>\nin the patchfile does not exist.\nTortoiseGitMerge tried to apply the patch by stripping prefixes but no matching path could be found."
+msgid "The path\n%s\nin the patchfile does not exist.\nTortoiseGitMerge tried to apply the patch by stripping prefixes but no matching path could be found."
 msgstr ""
 
 #. Resource IDs: (314)
 #, c-format
-msgid "The path\n<i>%s</i>\nseems not to match the paths in the patchfile.\nBut TortoiseGitMerge found the path\n<i>%s</i>\nmatches it better. Do you want to use the suggested path instead?"
+msgid "The path\n%s\nseems not to match the paths in the patchfile.\nBut TortoiseGitMerge found the path\n%s\nmatches it better. Do you want to use the suggested path instead?"
 msgstr ""
 
 #. Resource IDs: (71)
@@ -8084,12 +8326,16 @@ msgstr ""
 
 #. Resource IDs: (107)
 #, c-format
-msgid "TortoiseGitMerge %d.%d.%d, Build %d - %s, %s"
+msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s"
 msgstr ""
 
 #. Resource IDs: (107)
 #, c-format
-msgid "TortoiseGitMerge %d.%d.%d, Build %d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-utils %d.%d.%d"
+msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-utils %d.%d.%d"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "TortoiseMerge"
 msgstr ""
 
 #. Resource IDs: (1162)
@@ -8199,6 +8445,10 @@ msgstr ""
 msgid "Uncheck"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Undo"
+msgstr ""
+
 #. Resource IDs: (1069)
 #, c-format
 msgid "Undo %d Actions"
@@ -8216,6 +8466,10 @@ msgstr ""
 msgid "Undo the last action\nUndo"
 msgstr ""
 
+#. Resource IDs: (3603)
+msgid "Undo the last modifications\nUndo"
+msgstr ""
+
 #. Resource IDs: (3859)
 msgid "Unexpected file format."
 msgstr ""
@@ -8281,10 +8535,6 @@ msgstr ""
 msgid "Use &Default Image: "
 msgstr ""
 
-#. Resource IDs: (32855)
-msgid "Use &left block"
-msgstr ""
-
 #. Resource IDs: (1024)
 msgid "Use &one-pane view as default for 2-file diff"
 msgstr ""
@@ -8293,6 +8543,26 @@ msgstr ""
 msgid "Use &other text block"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Use 'mine' text block"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Use 'mine' text block then 'theirs'"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Use 'theirs' text block"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Use 'theirs' text block then 'mine'"
+msgstr ""
+
+#. Resource IDs: (156)
+msgid "Use Blocks"
+msgstr ""
+
 #. Resource IDs: (1482)
 msgid "Use MAPI"
 msgstr ""
@@ -8341,6 +8611,10 @@ msgstr ""
 msgid "Use both text blocks (this one last)"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Use left block"
+msgstr ""
+
 #. Resource IDs: (32856)
 msgid "Use left file"
 msgstr ""
@@ -8353,10 +8627,6 @@ msgstr ""
 msgid "Use regular expression"
 msgstr ""
 
-#. Resource IDs: (1066)
-msgid "Use stri&keout for removed lines"
-msgstr ""
-
 #. Resource IDs: (1426)
 msgid "Use system locale for date/time"
 msgstr ""
@@ -8382,7 +8652,7 @@ msgid "Use text block from 'mine'\nUse 'mine' text block"
 msgstr ""
 
 #. Resource IDs: (251)
-msgid "Use text block from 't&heirs' before 'mine"
+msgid "Use text block from 't&heirs' before 'mine'"
 msgstr ""
 
 #. Resource IDs: (2052)
@@ -8393,22 +8663,6 @@ msgstr ""
 msgid "Use text block from 'theirs'\nUse 'theirs' text block"
 msgstr ""
 
-#. Resource IDs: (32820)
-msgid "Use text block from \"&mine\""
-msgstr ""
-
-#. Resource IDs: (32819)
-msgid "Use text block from \"&theirs\""
-msgstr ""
-
-#. Resource IDs: (32822)
-msgid "Use text block from \"m&ine\" before \"theirs\""
-msgstr ""
-
-#. Resource IDs: (32821)
-msgid "Use text block from \"t&heirs\" before \"mine\""
-msgstr ""
-
 #. Resource IDs: (2054)
 msgid "Use text block from the left view\nUse left block"
 msgstr ""
@@ -8506,6 +8760,10 @@ msgstr ""
 msgid "Vietnamese"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "View"
+msgstr ""
+
 #. Resource IDs: (328, 603)
 msgid "View Patch"
 msgstr ""
@@ -8530,6 +8788,14 @@ msgstr ""
 msgid "Visit our website"
 msgstr ""
 
+#. Resource IDs: (156, 626)
+msgid "Visual Studio 2005"
+msgstr ""
+
+#. Resource IDs: (156, 626)
+msgid "Visual Studio 2008"
+msgstr ""
+
 #. Resource IDs: (214, 32848)
 msgid "Visual Studio.NET 200&5"
 msgstr ""
@@ -8603,6 +8869,18 @@ msgstr ""
 msgid "Windows &2000"
 msgstr ""
 
+#. Resource IDs: (156, 626)
+msgid "Windows 2000"
+msgstr ""
+
+#. Resource IDs: (156, 626)
+msgid "Windows 7"
+msgstr ""
+
+#. Resource IDs: (156, 626)
+msgid "Windows XP"
+msgstr ""
+
 #. Resource IDs: (5020)
 msgid "Windows-1250"
 msgstr ""
@@ -8651,6 +8929,14 @@ msgstr ""
 msgid "Working dir changes"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Wrap long lines"
+msgstr ""
+
+#. Resource IDs: (2056)
+msgid "Wrap long lines at the right border of the view\nWrap long lines"
+msgstr ""
+
 #. Resource IDs: (73)
 msgid "Yes"
 msgstr ""
@@ -9061,6 +9347,10 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
+#. Resource IDs: (169)
+msgid "scanning path:"
+msgstr ""
+
 #. Resource IDs: (195)
 msgid "skip-worktree"
 msgstr ""
-- 
2.11.4.GIT