Removed duplicate item :delete from locales

macbury · Jun 25, 2011 · e5027d6 · e5027d6
1 parent 4d332ba
commit e5027d6
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/app/views/clipboard/_show.html.erb b/app/views/clipboard/_show.html.erb
@@ -30,7 +30,7 @@
 					:method => :post, :title => t(:move_folder), :confirm => t(:are_you_sure)
 				%>&nbsp;
 			<% end -%>
-				<%= link_to image_tag('delete.png', :alt => t(:delete)),
+				<%= link_to image_tag('delete.png', :alt => t(:delete_item)),
 					{ :controller => :clipboard, :action => :destroy, :id => item.id, :type => 'folder', :folder_id => @folder, :authenticity_token => form_authenticity_token },
 					:method => :delete, :title => t(:remove_from_clipboard)
 				%>
@@ -54,7 +54,7 @@
 					:method => :post, :title => t(:move_file), :confirm => t(:are_you_sure)
 				%>&nbsp;
 			<% end -%>
-				<%= link_to image_tag('delete.png', :alt => t(:delete)),
+				<%= link_to image_tag('delete.png', :alt => t(:delete_item)),
 					{ :controller => :clipboard, :action => :destroy, :id => item.id, :type => 'file', :folder_id => @folder, :authenticity_token => form_authenticity_token },
 					:method => :delete, :title => t(:remove_from_clipboard)
 				%>

diff --git a/app/views/folders/show.html.erb b/app/views/folders/show.html.erb
@@ -56,7 +56,7 @@
 				<%= link_to image_tag('edit.png', :alt => t(:edit)), edit_folder_path(folder), :title => t(:edit) %>&nbsp;
 			<% end -%>
 			<% if current_user.can_delete(folder) -%>
-				<%= link_to image_tag('delete.png', :alt => t(:delete)), folder_path(folder), :method => 'delete', :confirm => t(:are_you_sure), :title => t(:delete) %>&nbsp;
+				<%= link_to image_tag('delete.png', :alt => t(:delete_item)), folder_path(folder), :method => :delete, :confirm => t(:are_you_sure), :title => t(:delete_item) %>&nbsp;
 			<% end -%>
 				<%= link_to image_tag('clipboard_add.png', :alt => t(:add_to_clipboard)),
 					{ :controller => :clipboard, :action => :create, :id => folder.id, :type => 'folder', :folder_id => @folder, :authenticity_token => form_authenticity_token },
@@ -78,7 +78,7 @@
 				<%= link_to image_tag('edit.png', :alt => t(:edit)), edit_file_path(file), :title => t(:edit) %>&nbsp;
 			<% end -%>
 			<% if current_user.can_delete(file.folder) -%>
-				<%= link_to image_tag('delete.png', :alt => t(:delete)), file_path(file), :method => 'delete', :confirm => t(:are_you_sure), :title => t(:delete) %>&nbsp;
+				<%= link_to image_tag('delete.png', :alt => t(:delete_item)), file_path(file), :method => :delete, :confirm => t(:are_you_sure), :title => t(:delete_item) %>&nbsp;
 			<% end -%>
 				<%= link_to image_tag('clipboard_add.png', :alt => t(:add_to_clipboard)),
 					{ :controller => :clipboard, :action => :create, :id => file.id, :type => 'file', :folder_id => @folder, :authenticity_token => form_authenticity_token },

diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
@@ -26,7 +26,7 @@
 		<td class="group_name"><%= group.name %></td>
 		<td>
 			<%= link_to image_tag('edit.png', :alt => t(:edit)), edit_group_path(group), :title => t(:edit) %>&nbsp;
-			<%= link_to image_tag('delete.png', :alt => t(:delete)), group_path(group), :method => 'delete', :confirm => t(:are_you_sure), :title => t(:delete) %>
+			<%= link_to image_tag('delete.png', :alt => t(:delete_item)), group_path(group), :method => :delete, :confirm => t(:are_you_sure), :title => t(:delete_item) %>
 		</td>
 	<% end -%>
 	</tr>

diff --git a/app/views/share_links/index.html.erb b/app/views/share_links/index.html.erb
@@ -16,7 +16,7 @@
 		<td class="file_name"><%= link_to share_link.user_file.attachment_file_name, folder_path(share_link.user_file.folder), :title => "#{share_link.user_file.attachment_file_name} (#{share_link.user_file.folder.name})" %></td>
 		<td><span class="share_link_emails" title="<%= share_link.emails %>"><%= truncate(share_link.emails, :length => 48) %></td>
 		<td><%= l share_link.link_expires_at, :format => :very_short %></td>
-		<td><%= link_to image_tag('delete.png', :alt => t(:delete)), share_link_path(share_link), :method => 'delete', :confirm => t(:are_you_sure), :title => t(:unshare) %></td>
+		<td><%= link_to image_tag('delete.png', :alt => t(:delete_item)), share_link_path(share_link), :method => :delete, :confirm => t(:are_you_sure), :title => t(:unshare) %></td>
 	</tr>
 <% end -%>
 </table>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
@@ -24,7 +24,7 @@
 		<td>
 			<%= link_to image_tag('edit.png', :alt => t(:edit)), edit_user_path(user), :title => t(:edit) %>&nbsp;
 		<% unless user.is_admin -%>
-			<%= link_to image_tag('delete.png', :alt => t(:delete)), user_path(user), :method => 'delete', :confirm => t(:are_you_sure), :title => t(:delete) %>
+			<%= link_to image_tag('delete.png', :alt => t(:delete_item)), user_path(user), :method => :delete, :confirm => t(:are_you_sure), :title => t(:delete_item) %>
 		<% end -%>
 		</td>
 	</tr>

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -249,7 +249,7 @@ de:
   move_folder: Ordner verschieben
   move_file: Datei verschieben
   are_you_sure: Sind Sie sicher?
-  delete: Löschen
+  delete_item: Löschen
   remove_from_clipboard: Aus der Zwischenablage entfernen
   clear_clipboard: Zwischenablage leeren
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -240,7 +240,7 @@
   move_folder: Move folder
   move_file: Move file
   are_you_sure: Are you sure?
-  delete: Delete
+  delete_item: Delete
   remove_from_clipboard: Remove from clipboard
   clear_clipboard: Clear clipboard
 

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
@@ -243,7 +243,7 @@ nl:
   move_folder: Map verplaatsen
   move_file: Bestand verplaatsen
   are_you_sure: Weet u het zeker?
-  delete: Verwijder
+  delete_item: Verwijderen
   remove_from_clipboard: Verwijder van klembord
   clear_clipboard: Klembord legen