Merge branch 'budget' into admin-budgets

config/locales/en.yml

@@ -525,8 +525,6 @@ en:
       deleted: Deleted
       deleted_debate: This debate has been deleted
       deleted_proposal: This proposal has been deleted
-      delete_spending_proposal: Delete
-      confirm_deletion_spending_proposal: Are you sure? This action can not be undone
       filters:
         comments:
           one: 1 Comment
@@ -537,9 +535,9 @@ en:
         proposals:
           one: 1 Proposal
           other: "%{count} Proposals"
-        spending_proposals:
-          one: 1 Spending proposal
-          other: "%{count} Spending proposals"
+        budget_investments:
+          one: 1 Investment
+          other: "%{count} Investments"
       no_activity: User has no public activity
       no_private_messages: "This user doesn't accept private messages."
       private_activity: This user decided to keep the activity list private

config/locales/es.yml

@@ -525,8 +525,6 @@ es:
       deleted: Eliminado
       deleted_debate: Este debate ha sido eliminado
       deleted_proposal: Este propuesta ha sido eliminada
-      delete_spending_proposal: Eliminar
-      confirm_deletion_spending_proposal: "¿Seguro que desea eliminar esta propuesta?"
       filters:
         comments:
           one: 1 Comentario
@@ -537,7 +535,7 @@ es:
         proposals:
           one: 1 Propuesta
           other: "%{count} Propuestas"
-        spending_proposals:
+        budget_investments:
           one: 1 Propuesta de inversión
           other: "%{count} Propuestas de inversión"
       no_activity: Usuario sin actividad pública