Author: toad
Date: 2007-05-03 22:52:05 +0000 (Thu, 03 May 2007)
New Revision: 13142
Modified:
trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Coalesce "cancel" keys
Modified: trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
2007-05-03 22:46:14 UTC (rev 13141)
+++ trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
2007-05-03 22:52:05 UTC (rev 13142)
@@ -166,7 +166,7 @@
HTMLNode confirmForm =
ctx.addFormChild(infoBox.addChild("p"), "", "confirmDeleteForm");
confirmForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "hidden", "bookmark", bookmarkPath});
- confirmForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "cancel",
L10n.getString("BookmarkEditorToadlet.cancelDelete") });
+ confirmForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "cancel",
L10n.getString("Toadlet.cancel") });
confirmForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "confirmdelete",
L10n.getString("BookmarkEditorToadlet.confirmDelete") });
} else if (action.equals("cut")) {
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-05-03 22:46:14 UTC (rev 13141)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-05-03 22:52:05 UTC (rev 13142)
@@ -954,7 +954,7 @@
L10n.getString("confirmRemoveNode", new String[] { "name" }, new String[] {
peerNodes[i].getName() }));
HTMLNode removeForm =
ctx.addFormChild(content, "/darknet/", "removeConfirmForm");
removeForm.addChild("input",
new String[] { "type", "name", "value" }, new String[] { "hidden",
"node_"+peerNodes[i].hashCode(), "remove" });
- removeForm.addChild("input",
new String[] { "type", "name", "value" }, new String[] { "submit", "cancel",
l10n("cancel") });
+ removeForm.addChild("input",
new String[] { "type", "name", "value" }, new String[] { "submit", "cancel",
L10n.getString("Toadlet.cancel") });
removeForm.addChild("input",
new String[] { "type", "name", "value" }, new String[] { "submit", "remove",
l10n("remove") });
removeForm.addChild("input",
new String[] { "type", "name", "value" }, new String[] { "hidden", "forceit",
l10n("forceRemove") });
Modified: trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2007-05-03
22:46:14 UTC (rev 13141)
+++ trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2007-05-03
22:52:05 UTC (rev 13142)
@@ -141,7 +141,7 @@
infoboxContent.addChild("#",
l10n("unloadPluginWithName", "name", request.getPartAsString("unload",
MAX_PLUGIN_NAME_LENGTH)));
HTMLNode unloadForm =
ctx.addFormChild(infoboxContent,
"/plugins/", "unloadPluginConfirmForm");
- unloadForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "cancel", l10n("cancel") });
+ unloadForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "cancel",
L10n.getString("Toadlet.cancel") });
unloadForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "hidden", "unloadconfirm",
request.getPartAsString("unload", MAX_PLUGIN_NAME_LENGTH) });
unloadForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "confirm", l10n("unload")
});
writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-05-03
22:46:14 UTC (rev 13141)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-05-03
22:52:05 UTC (rev 13142)
@@ -34,7 +34,6 @@
BookmarkEditorToadlet.deleteCategory=Delete category
BookmarkEditorToadlet.deleteBookmarkConfirm=Are you sure you want to delete
${bookmark}?
BookmarkEditorToadlet.deleteCategoryConfirm=Are you sure you want to delete
${bookmark} and all of its children?
-BookmarkEditorToadlet.cancelDelete=Cancel
BookmarkEditorToadlet.confirmDelete=Delete
BookmarkEditorToadlet.editBookmarkTitle=Edit Bookmark
BookmarkEditorToadlet.editCategoryTitle=Edit Category
@@ -149,7 +148,6 @@
DarknetConnectionsToadlet.confirmRemoveNode=Are you sure you wish to remove
"+peerNodes[i].getName()+" ? Before it has at least one week downtime, it's not
recommended to do so, as it may be down only temporarily, and many users cannot
run their nodes 24x7.
DarknetConnectionsToadlet.confirmRemoveNodeWarningTitle=Node Removal
DarknetConnectionsToadlet.confirmRemoveNodeTitle=Please confirm
-DarknetConnectionsToadlet.cancel=Cancel
DarknetConnectionsToadlet.remove=Remove it!
DarknetConnectionsToadlet.forceRemove=Force Remove
FproxyToadlet.dangerousRSSTitle=Potentially Dangerous Content (RSS)
@@ -265,7 +263,6 @@
PproxyToadlet.returnToPluginPage=Return to plugin page
PproxyToadlet.unloadPluginTitle=Unload plugin?
PproxyToadlet.unloadPluginWithName=Are you sure you wish to unload ${name}?
-PproxyToadlet.cancel=Cancel
PproxyToadlet.unload=Unload
PproxyToadlet.pluginNotFoundReloadTitle=Plugin Not Found (reloading)
PproxyToadlet.pluginNotFoundReload=The specified plugin could not be located
in order to reload it.
