From 5a0424f458323578a6b2e5395a58f3d2bfc034dc Mon Sep 17 00:00:00 2001
From: Shai Ben-Naphtali <shai@shaibn.com>
Date: Tue, 21 Jul 2009 03:30:21 +0800
Subject: Fix some consistency in text. This fixes ticket #546

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 modules/organize/controllers/organize.php     | 4 ++--
 modules/server_add/controllers/server_add.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 27852904..898be509 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -516,7 +516,7 @@ class Organize_Controller extends Controller {
       break;
 
     case "delete":
-      return array("description" => t("Delete selected photos and albums"),
+      return array("description" => t("Delete selected photos / albums"),
                    "name" => t("Delete images in %name", array("name" => $item->title)),
                    "type" => "delete",
                    "runningMsg" => t("Delete images in progress"),
@@ -537,4 +537,4 @@ class Organize_Controller extends Controller {
       throw new Exception("Operation '$operation' is not implmented");
     }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 0be0f698..f68392ce 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -239,7 +239,7 @@ class Server_Add_Controller extends Admin_Controller {
         $entry->save();
       }
       $task->set("completed_files", $completed_files);
-      $task->status = t("Adding photos and albums (%completed of %total)",
+      $task->status = t("Adding photos / albums (%completed of %total)",
                         array("completed" => $completed_files,
                               "total" => $total_files));
       $task->percent_complete = 10 + 100 * ($completed_files / $total_files);
@@ -252,7 +252,7 @@ class Server_Add_Controller extends Admin_Controller {
       $task->percent_complete = 100;
       ORM::factory("server_add_file")->where("task_id", $task->id)->delete_all();
       message::info(t2("Successfully added one photo / album",
-                       "Successfully added %count photos and albums",
+                       "Successfully added %count photos / albums",
                        $task->get("completed_files")));
     }
   }
-- 
cgit v1.2.3


From b99774ac49999e4701f1c410f0018a417a5f613e Mon Sep 17 00:00:00 2001
From: Shai Ben-Naphtali <shai@shaibn.com>
Date: Tue, 21 Jul 2009 12:13:13 +0800
Subject: Fixed grammer and set lowercase for the word project (minor change)

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 modules/gallery/views/after_install.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/views/after_install.html.php b/modules/gallery/views/after_install.html.php
index d6ba8e7c..e4842163 100644
--- a/modules/gallery/views/after_install.html.php
+++ b/modules/gallery/views/after_install.html.php
@@ -21,7 +21,7 @@
 </p>
 
 <p>
-  <?= t("Want to learn more? The <a href=\"%url\">Gallery website</a> has news and information about Gallery Project and community.", array("url" => "http://gallery.menalto.com")) ?>
+  <?= t("Want to learn more? The <a href=\"%url\">Gallery website</a> has news and information about the Gallery project and community.", array("url" => "http://gallery.menalto.com")) ?>
 </p>
 
 <p>
-- 
cgit v1.2.3