summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/organize/controllers/organize.php4
-rw-r--r--modules/server_add/controllers/server_add.php4
2 files changed, 4 insertions, 4 deletions
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")));
}
}