From b37cf0c7fb532ceaa59f7dd71b160bfb100eddbe Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Wed, 1 May 2013 18:08:38 +0200
Subject: [PATCH] Updated Tortoise.pot

An update was forgotten last time.

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

diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot
index 39b459126..902a9ed88 100644
--- a/Languages/Tortoise.pot
+++ b/Languages/Tortoise.pot
@@ -584,6 +584,10 @@ msgstr ""
 msgid "&Enable Proxy Server"
 msgstr ""
 
+#. Resource IDs: (32976)
+msgid "&Enable edit"
+msgstr ""
+
 #. Resource IDs: (323)
 msgid "&Export selection to..."
 msgstr ""
@@ -1635,6 +1639,10 @@ msgstr ""
 msgid "All your changes will be lost! Do you really want to reset the toolbar '%s'?"
 msgstr ""
 
+#. Resource IDs: (2062)
+msgid "Allow Editing for this view\nAllow Edit"
+msgstr ""
+
 #. Resource IDs: (66)
 msgid "Already up to date."
 msgstr ""
@@ -1692,6 +1700,14 @@ msgstr ""
 msgid "An unknown line type was found in line %d !"
 msgstr ""
 
+#. Resource IDs: (251)
+msgid "Append right block"
+msgstr ""
+
+#. Resource IDs: (251)
+msgid "Append this block to left"
+msgstr ""
+
 #. Resource IDs: (65535)
 msgid "Application Frame Menus: "
 msgstr ""
@@ -2463,6 +2479,10 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
+#. Resource IDs: (32785)
+msgid "Color by age, &continuous"
+msgstr ""
+
 #. Resource IDs: (138, 16961, 65535)
 msgid "Colors"
 msgstr ""
@@ -3567,6 +3587,10 @@ msgstr ""
 msgid "Edit local git config"
 msgstr ""
 
+#. Resource IDs: (1254)
+msgid "Edit log message"
+msgstr ""
+
 #. Resource IDs: (1384)
 msgid "Edit s&ystemwide gitconfig"
 msgstr ""
@@ -3599,6 +3623,10 @@ msgstr ""
 msgid "Empty"
 msgstr ""
 
+#. Resource IDs: (156)
+msgid "Enable Edit"
+msgstr ""
+
 #. Resource IDs: (87)
 msgid "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)"
 msgstr ""
@@ -4596,6 +4624,10 @@ msgstr ""
 msgid "ID:32893:V C +G"
 msgstr ""
 
+#. Accelerator Entry for Menu ID:32976; '&Enable edit'
+msgid "ID:32976:V C +E"
+msgstr ""
+
 #. Accelerator Entry for Menu ID:57601; '&Open'
 #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O'
 msgid "ID:57601:V C +O"
@@ -6217,6 +6249,14 @@ msgstr ""
 msgid "Preparing commit..."
 msgstr ""
 
+#. Resource IDs: (251)
+msgid "Prepend right block"
+msgstr ""
+
+#. Resource IDs: (251)
+msgid "Prepend this block to left"
+msgstr ""
+
 #. Resource IDs: (65535)
 msgid "Press &New Shortcut Key:"
 msgstr ""
@@ -8438,7 +8478,7 @@ msgstr ""
 
 #. Resource IDs: (107)
 #, c-format
-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"
+msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d"
 msgstr ""
 
 #. Resource IDs: (7)
@@ -8446,10 +8486,6 @@ msgstr ""
 msgid "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears more than once."
 msgstr ""
 
-#. Resource IDs: (156)
-msgid "TortoiseMerge"
-msgstr ""
-
 #. Resource IDs: (1739)
 msgid "Total changed lines including added/deleted files:"
 msgstr ""
@@ -8775,6 +8811,10 @@ msgstr ""
 msgid "Use regular expression"
 msgstr ""
 
+#. Resource IDs: (251)
+msgid "Use right block"
+msgstr ""
+
 #. Resource IDs: (1426)
 msgid "Use system locale for date/time"
 msgstr ""
@@ -8824,6 +8864,10 @@ msgid "Use this &whole file"
 msgstr ""
 
 #. Resource IDs: (251)
+msgid "Use this block on left"
+msgstr ""
+
+#. Resource IDs: (251)
 msgid "Use whole other &file"
 msgstr ""
 
@@ -9472,6 +9516,10 @@ msgstr ""
 msgid "on %1"
 msgstr ""
 
+#. Resource IDs: (1753)
+msgid "origin"
+msgstr ""
+
 #. Resource IDs: (3869)
 msgid "pixels"
 msgstr ""
-- 
2.11.4.GIT