From 0799b67a825c8ec00e57a63e5a5d55fd26bb2337 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 15:23:37 +0000
Subject: Merge from BRANCH_1_0.

---
(limited to 'i18n/en/advancedfm.ts')

diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index ee084a6..ed7af0f 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -142,14 +142,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
@@ -190,11 +182,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
@@ -229,21 +216,43 @@ and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Cannot remove current directory
 from bookmarks.
-It is not bookmarked!!</source>
+It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bookmark Directory</source>
+        <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Current Directory from Bookmarks</source>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <source>Really delete
+%1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -257,6 +266,21 @@ It is not bookmarked!!</source>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
@@ -300,5 +324,25 @@ It is not bookmarked!!</source>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--
cgit v0.9.0.2