summaryrefslogtreecommitdiff
path: root/modules/server_add
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-07-20 22:23:34 -0700
committerBharat Mediratta <bharat@menalto.com>2009-07-20 22:23:34 -0700
commitd7814f37cb2194098bd8aa3887bd830033200e8b (patch)
treed7634d5db40c43244b6b2d8b08b5a348cedb7c4f /modules/server_add
parentce963c9db00c25b3c1e6add1fe6032aef61a5bed (diff)
parentb99774ac49999e4701f1c410f0018a417a5f613e (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add')
-rw-r--r--modules/server_add/controllers/server_add.php4
1 files changed, 2 insertions, 2 deletions
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")));
}
}