uploader 0.2.8 → 1.0.0

data/Gemfile

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+
+gem "rails", "3.0.0.rc2"
+gem "capybara", ">= 0.3.9"
+gem 'mysql'
+
+gem "mime-types"
+gem "rack"
+gem "paperclip"
+
+if RUBY_VERSION < '1.9'
+  gem "ruby-debug", ">= 0.10.3"
+end

data/README.rdoc

@@ -2,6 +2,11 @@
 
 Uploader makes it easy to integrate multiple file uploads into your application using SWFUpload
 
+== ----NOTES----
+SWFUpload hasn't been updated in a while. Uploader 0.2.8 has been updated with the latest beta version of SWFUpload but it appears to have errors in some instances.
+Version 0.2.8 will be the last version to use swfupload.
+
+We are currently working on a new upload gem that will use pupload
 
 == Installation
 
@@ -247,13 +252,13 @@ If you want to use a different model or several models just add a rake task to y
   desc 'Send all uploads to S3.  (Will only send uploads from a model named Upload)'
   task :upload_to_s3 do
     
-    uploads = Upload.pending_s3_migration
+    uploads = Upload.pending_s3_migrations
     uploads.each do |upload|
       upload.remote = upload.local
       upload.save!
     end
     
-    photos = Photo.pending_s3_migration
+    photos = Photo.pending_s3_migrations
     photos.each do |photo|
       photo.remote = photo.local
       photo.save!

data/Rakefile

@@ -32,11 +32,11 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "uploader"
-    gemspec.summary = "SWFUpload + Paperclip wrapped in an engine with love."
+    gemspec.summary = "Uploadify, SWFUpload + Paperclip wrapped in an engine with love."
     gemspec.email = "justinball@gmail.com"
     gemspec.homepage = "http://github.com/jbasdf/uploader"
-    gemspec.description = "Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload and Paperclip"
-    gemspec.authors = ["Justin Ball", "David South"]
+    gemspec.description = "Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload, Uploadify and Paperclip"
+    gemspec.authors = ["Justin Ball", "Joel Duffin", "David South"]
     gemspec.files.include %w( test/rails_root/db/schema.rb )
     gemspec.rubyforge_project = 'uploader'
     gemspec.add_dependency "mime-types"

data/VERSION

@@ -1 +1 @@
-0.2.8
+1.0.0

data/app/controllers/uploader/uploads_controller.rb

@@ -34,12 +34,12 @@ class Uploader::UploadsController < ApplicationController
     end
   end
 
-  def swfupload
+  def multiupload
     @upload = Upload.new
     @upload.is_public = true if params[:is_public] == true
     @upload.creator = get_creator
     @upload.uploadable = @parent
-    @upload.swfupload_local = params[:Filedata]
+    @upload.multiupload_local = params[:Filedata]
     @upload.save!
     respond_to do |format|
       format.js { render :text => get_upload_text(@upload) }

data/app/helpers/uploader_helper.rb

@@ -1,6 +1,6 @@
 module UploaderHelper
 
-  # Output a form capable of uploading files to the server.
+  # Output a form capable of uploading files to the server using swfupload.
   # parent: The object to which the uploads will be attached
   # display_upload_indicators: Indicates whether or not to show the upload progress
   # container_prefix: Prefixes each id in the html with the specified text.  Useful if there is to be more than one form on a page.
@@ -23,9 +23,57 @@ module UploaderHelper
                                                          :options => options}
   end
 
+  # Output a form capable of uploading multiple files to the server using uploadify.
+  # parent: The object to which the uploads will be attached
+  # display_upload_indicators: Indicates whether or not to show the upload progress
+  # container_prefix: Prefixes each id in the html with the specified text.  Useful if there is to be more than one form on a page.
+  # Options is a hash containing any valid option for uploadify:
+  # http://www.uploadify.com/documentation/
+  def uploadify_form(parent, display_upload_indicators = true, container_prefix = '', options = {})
+    container_prefix = 'uploadify' if container_prefix.blank?
+    
+    uploadify_options = {
+          :uploader        => '/swf/uploadify.swf',
+          :script          => new_upload_path_with_parent_information(parent),
+          :cancelImg       => '/images/uploadify/cancel.png',
+          :fileDesc        => "All Files",
+          :fileExt         => "*.*",
+          :auto            => true,
+          :multi           => true,
+          :buttonText      => 'Upload',
+          :scriptData      => {
+            '_http_accept'       => 'application/javascript',
+            '_method'            => 'post',
+            "#{session_key}"     => 'session_key_replace_',
+            'authenticity_token' => 'authenticity_token_replace_'
+          }
+      }.merge(options)
+      
+      uploadify_options_json = uploadify_options.to_json
+      # This is a bit of a hack but to_json will surround 'encodeURIComponent' with quotes so it won't execute. 
+      # We need it to execute. The double encode is required - u on the server and encodeURIComponent on the client.
+      uploadify_options_json.gsub!('"session_key_replace_"', "encodeURIComponent('#{u(cookies[session_key])}')")
+      uploadify_options_json.gsub!('"authenticity_token_replace_"', "encodeURIComponent('#{u(form_authenticity_token)}')")
+      
+    render :partial => 'uploads/uploadify', :locals => { :parent => parent,
+                                                         :container_prefix => container_prefix,
+                                                         :uploadify_options => uploadify_options_json}
+  end
+  
   def new_upload_path_with_session_information(upload_parent, format = 'js')
-    session_key = ActionController::Base.session_options[:key]
-    swfupload_uploads_path({:format => format, session_key => cookies[session_key], request_forgery_protection_token => form_authenticity_token}.merge(make_parent_params(upload_parent)))
+    multiupload_uploads_path({:format => format, :session_key => cookies[session_key], :request_forgery_protection_token => form_authenticity_token}.merge(make_parent_params(upload_parent)))
+  end
+  
+  def new_upload_path_with_parent_information(upload_parent, format = 'js')
+    multiupload_uploads_path({:format => format}.merge(make_parent_params(upload_parent)))
+  end
+  
+  def session_key
+    if defined?(Rails.application)
+      Rails.application.config.session_options[:key]
+    else
+      ActionController::Base.session_options[:key]
+    end
   end
   
   def make_parent_params(parent)

data/app/views/uploads/_uploadify.html.erb

@@ -0,0 +1,16 @@
+<% if !defined?(@uploadify_scripts_included) -%>
+  <% @uploadify_scripts_included = true -%>
+  <% content_for :head do  -%>
+     <%= javascript_include_tag %w{ jquery/jquery.uploadify.min.js swf/swfobject.js }, :cache => 'uploadify_cached' %>
+    <%= stylesheet_link_tag 'uploadify' %>
+  <% end -%>
+<% end -%>
+
+<% form_for :upload, :url => uploads_path(make_parent_params(parent)), :html => { :multipart => true, :id => container_prefix } do |f| -%>
+  <p><%= f.file_field :local, :size => 25 %></p>
+  <%= submit_tag t('uploader.upload_file') %>
+<% end %>
+
+<script type='text/javascript'>
+jQuery('form#<%=container_prefix%>').uploadify(<%=uploadify_options%>);
+</script>

data/lib/active_record/acts/uploader_upload.rb

@@ -22,17 +22,18 @@ module ActiveRecord
         def acts_as_uploader(options)
 
           #Named scopes
-          named_scope :newest_first, :order => "created_at DESC"
-          named_scope :alphabetic, :order => "filename DESC"
-          named_scope :recent, :order => "created_at DESC"
+          named_scope :newest, :order => "created_at DESC"
+          named_scope :by_filename, :order => "local_file_name DESC"
+          named_scope :newest, :order => "created_at DESC"
           named_scope :public, :conditions => 'is_public = true'
           named_scope :images, :conditions => "local_content_type IN (#{Uploader::MimeTypeGroups::IMAGE_TYPES.collect{|type| "'#{type}'"}.join(',')})"
           named_scope :documents, :conditions => "local_content_type IN (#{(Uploader::MimeTypeGroups::WORD_TYPES + Uploader::MimeTypeGroups::EXCEL_TYPES + Uploader::MimeTypeGroups::PDF_TYPES).collect{|type| "'#{type}'"}.join(',')})" 
           named_scope :files, :conditions => "local_content_type NOT IN (#{Uploader::MimeTypeGroups::IMAGE_TYPES.collect{|type| "'#{type}'"}.join(',')})"
-          named_scope :since, lambda { |*args| { :conditions => ["created_at > ?", (args.first || 7.days.ago.to_s(:db)) ]} }
+          named_scope :recent, lambda { |*args| { :conditions => ["created_at > ?", (args.first || 7.days.ago.to_s(:db)) ]} }
           named_scope :created_by, lambda { |*args| { :conditions => ["creator_id = ?", (args.first) ]} }
-          named_scope :pending_s3_migration, lambda { { :conditions =>  ["remote_file_name IS NULL AND created_at <= ?", 20.minutes.ago.to_s(:db)], :order => 'created_at DESC' } }
+          named_scope :pending_s3_migrations, lambda { { :conditions =>  ["remote_file_name IS NULL"], :order => 'created_at DESC' } }
 
+          
           # Paperclip
           has_attached_file :local, options[:has_attached_file].merge(:storage => :filesystem) # Override any storage settings.  This one has to be local.
           has_attached_file :remote, options[:has_attached_file].merge(:url => ':s3_alias_url',
@@ -85,7 +86,7 @@ module ActiveRecord
           end
         end
         
-        def swfupload_local=(filedata)
+        def multiupload_local=(filedata)
           filedata.content_type = MIME::Types.type_for(filedata.original_filename)[0].to_s
           self.local = filedata
         end

data/lib/daemons/amazonaws.rb

@@ -24,7 +24,7 @@ while($running) do
     sleep 2
   else
     $waiting = 0
-    upload = Upload.pending_s3_migration.first
+    upload = Upload.pending_s3_migrations.first
 
     if upload
       $waiting = 120 - 2

data/lib/uploader/middleware/flash_session_cookie_middleware.rb

@@ -8,10 +8,11 @@ module Uploader
     end
     def call(env)
       if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
-        params = ::Rack::Utils.parse_query(env['QUERY_STRING'])
-        env['HTTP_COOKIE'] = [ @session_key, params[@session_key] ].join('=').freeze unless params[@session_key].nil?
+        req = Rack::Request.new(env)
+        env['HTTP_COOKIE'] = [ @session_key, req.params[@session_key] ].join('=').freeze unless req.params[@session_key].nil?
+        env['HTTP_ACCEPT'] = "#{req.params['_http_accept']}".freeze unless req.params['_http_accept'].nil?
       end
       @app.call(env)
     end
   end
-end
+end

data/lib/uploader/tasks.rb

@@ -18,7 +18,7 @@ module Uploader
         
         desc 'Send all uploads to S3.  (Will only send uploads from a model named Upload)'
         task :upload_to_s3 do
-          uploads = Upload.pending_s3_migration
+          uploads = Upload.pending_s3_migrations
           uploads.each do |upload|
             upload.remote = upload.local
             upload.save!

data/locales/ar.yml

@@ -2,20 +2,20 @@
 ar: 
   uploader: 
     cancel_all: "إلغاء جميع الاحصائيات"
-    file_delete_permission_denied: "ليس لديك الإذن لحذف هذا الملف."
-    file_deleted: "الملف محذوف"
+    file_delete_permission_denied: "لا يوجد لديك الإذن لحذف هذا الملف."
+    file_deleted: "حذف ملف"
     file_upload_error: "حدث خطأ أثناء تحميل الملف."
-    javascript_not_enabled: "نحن آسفون. SWFUpload لا يمكن تحميل. يجب أن يكون جافا سكريبت ليتمتع SWFUpload."
+    javascript_not_enabled: "نحن آسفون. يمكن أن يتم تحميل SWFUpload. يجب أن يكون جافا سكريبت لتتمكن من التمتع SWFUpload."
     manage_files: "إدارة الملفات"
-    manage_photos_files: "إدارة صور وملفات"
-    missing_parent_id_error: "يرجى تحديد الكائن الأصل"
+    manage_photos_files: "إدارة الصور / الملفات"
+    missing_parent_id_error: "الرجاء تحديد الكائن الأصل"
     permission_denied: "ليس لديك إذن لإكمال هذا الإجراء."
-    show_degraded_container: "استخدام رافع القياسية"
-    show_swfupload_container: "استخدام متعدد ملف رافع. (يتطلب فلاش)"
-    standard_file_upload_error: "حدث خطأ أثناء تحميل الملف : {{error}}. يرجى التأكد من أن الملف هو صالح. تحقق للتأكد من أن الملف ليس فارغا. ثم حاول مرة أخرى."
-    successful_upload: "الملف الذي تم تحميله بنجاح."
+    show_degraded_container: "استخدام معيار رافع"
+    show_swfupload_container: "استخدام متعدد رافع الملف. (يتطلب فلاش)"
+    standard_file_upload_error: "حدث خطأ أثناء تحميل الملف : %{error}. الرجاء التأكد من أن الملف هو صالح. تحقق للتأكد من أن الملف ليس فارغا. ثم حاول مرة أخرى."
+    successful_upload: "تم الرفع بنجاح الملف."
     swf_loading: "SWFUpload يتم تحميل. يرجى الانتظار قليلا..."
-    swf_not_loading: "نحن آسفون. SWFUpload لا يمكن تحميل. قد تحتاج إلى تثبيت أو ترقية مشغل فلاش. زيارة {{url}}للحصول على مشغل فلاش."
-    swf_taking_to_long: "SWFUpload وقتا طويلا لتحميل أو الحمل قد فشلت. يرجى التأكد من أن البرنامج المساعد فلاش ممكنا ، وأنه على نسخة عمل من أدوبي فلاش لاعب مثبت."
-    upload_file: "إيداع ملف"
+    swf_not_loading: "نحن آسفون. يمكن أن يتم تحميل SWFUpload. قد تحتاج إلى تثبيت أو ترقية فلاش لاعب. زيارة %{url} للحصول على فلاش لاعب."
+    swf_taking_to_long: "SWFUpload يأخذ وقتا طويلا للتحميل أو تحميل قد فشلت. الرجاء التأكد من أن يتم تمكين البرنامج المساعد فلاش والتي يتم تثبيتها على إصدار عمل أدوبي فلاش لاعب."
+    upload_file: "تحميل ملف"
     upload_files: "تحميل ملفات"

data/locales/bg.yml

@@ -3,19 +3,19 @@ bg:
   uploader: 
     cancel_all: "Отмени всички качвания"
     file_delete_permission_denied: "Вие нямате право да изтриете този файл."
-    file_deleted: "Изтрит файл"
+    file_deleted: "Изтрити файлове"
     file_upload_error: "Възникна грешка при качването на файла."
-    javascript_not_enabled: "Съжаляваме. SWFUpload не могат да заредят. Трябва да имате ДжаваСкрипт поддръжка за да се насладите SWFUpload."
+    javascript_not_enabled: "Съжаляваме. SWFUpload не може да зареди. Трябва да имате ДжаваСкрипт поддръжка за да ползват SWFUpload."
     manage_files: "Управление на файлове"
-    manage_photos_files: "Управление Снимки / Файлове"
-    missing_parent_id_error: "Моля, посочете обект майка"
-    permission_denied: "Вие нямате право да се извърши съответното действие."
-    show_degraded_container: "Използвайте стандартни качване"
-    show_swfupload_container: "Използване на няколко-файл за качване. (Изисква Flash)"
-    standard_file_upload_error: "Възникна грешка при качването на файла: {{error}}. Моля, уверете се, че файлът е валиден. Уверете се, че преписката не е празна. След това се опитайте отново."
+    manage_photos_files: "Управление на снимки / файлове"
+    missing_parent_id_error: "Моля, посочете един обект майка"
+    permission_denied: "Вие нямате право да извърши съответното действие."
+    show_degraded_container: "Използват се стандартни качване"
+    show_swfupload_container: "Използвайте няколко файла за качване. (Изисква Flash)"
+    standard_file_upload_error: "Възникна грешка при качването на файла: %{error}. Моля, уверете се, че файлът е валиден. Проверете дали файлът не е празна. След това опитайте отново."
     successful_upload: "Успешно качен файл."
-    swf_loading: "SWFUpload се зарежда. Моля, изчакайте за момент ..."
-    swf_not_loading: "Съжаляваме. SWFUpload не могат да заредят. Може да се наложи да инсталирате или ъпгрейд Flash Player. Посетете {{url}} да получите Flash Player."
-    swf_taking_to_long: "SWFUpload е необходимо много време, за да заредите или товар се е провалил. Моля, уверете се, че Flash Plug-in е активирана и че работна версия на Adobe Flash Player е инсталиран."
-    upload_file: "Качване на файла"
-    upload_files: "Upload Files"
+    swf_loading: "SWFUpload се зарежда. Моля, изчакайте един момент ..."
+    swf_not_loading: "Съжаляваме. SWFUpload не може да зареди. Може да се наложи да инсталирате или ъпгрейд Flash Player. Посетете %{url} да получите Player Flash."
+    swf_taking_to_long: "SWFUpload е необходимо много време да се зареди или ако товарът е неуспешно. Моля, уверете се, че Flash Plug-in е активирана и че работна версия на Adobe Flash Player е инсталиран."
+    upload_file: "Качване на файл"
+    upload_files: "Качване на файлове"

data/locales/ca.yml

@@ -2,20 +2,20 @@
 ca: 
   uploader: 
     cancel_all: "Cancel tots els fitxers enviats"
-    file_delete_permission_denied: "Vostè no té permís per eliminar aquest arxiu."
-    file_deleted: "Arxiu esborrat"
+    file_delete_permission_denied: "No té permís per eliminar aquest arxiu."
+    file_deleted: "Suprimit arxiu"
     file_upload_error: "S'ha produït un error en carregar l'arxiu."
-    javascript_not_enabled: "Ho sentim. SWFUpload no va poder carregar. Vostè ha de tenir Javascript per poder gaudir de SWFUpload."
+    javascript_not_enabled: "Ho sentim. SWFUpload no es va poder carregar. Vostè ha de tenir Javascript per poder gaudir de SWFUpload."
     manage_files: "Administrar arxius"
-    manage_photos_files: "Manejar Fotos / Files"
+    manage_photos_files: "Manejar fotos / arxius"
     missing_parent_id_error: "Si us plau, especifiqueu un objecte primari"
-    permission_denied: "Vostè no té permís per completar aquesta acció."
-    show_degraded_container: "Uploader ús estàndard"
-    show_swfupload_container: "Utilitzeu múltiples fitxer de càrrega. (Requereix Flash)"
-    standard_file_upload_error: "S'ha produït un error en carregar l'arxiu: {{error}}. Si us plau, assegureu-vos que el fitxer és vàlid. Assegureu-vos que l'arxiu no està buit. Torneu a intentar-ho."
-    successful_upload: "Amb èxit arxiu carregat."
+    permission_denied: "Vostè no té permís per realitzar aquesta acció."
+    show_degraded_container: "L'ús estàndard de carregador"
+    show_swfupload_container: "Utilitzeu múltiples fitxers uploader. (Requereix Flash)"
+    standard_file_upload_error: "S'ha produït un error en carregar l'arxiu: %{error}. Assegureu-vos que l'arxiu és vàlid. Comproveu que l'arxiu no està buit. A continuació, proveu de nou."
+    successful_upload: "Carregat correctament l'arxiu."
     swf_loading: "SWFUpload s'està carregant. Si us plau, espereu un moment ..."
-    swf_not_loading: "Ho sentim. SWFUpload no va poder carregar. És possible que necessiteu instal lar o actualitzar Flash Player. Visiteu el {{url}} per obtenir el Flash Player."
-    swf_taking_to_long: "SWFUpload està prenent un temps llarg per a la càrrega o la càrrega ha fallat. Si us plau, assegureu-vos que està activat el Plugin de Flash i que està instal • lada una versió de treball de Flash Player d'Adobe."
-    upload_file: Carrega
-    upload_files: "Carregar arxius"
+    swf_not_loading: "Ho sentim. SWFUpload no es va poder carregar. Podria ser necessari instal lar o actualitzar Flash Player. Visiteu el %{url} per obtenir el Flash Player."
+    swf_taking_to_long: "SWFUpload està prenent molt de temps per carregar o la càrrega ha fallat. Assegureu-vos que el plugin de Flash està habilitada i que una versió de treball d'Adobe Flash Player està instal lat."
+    upload_file: "Pujar Arxiu"
+    upload_files: Carregar

data/locales/cs.yml

@@ -1,21 +1,21 @@
 --- 
 cs: 
   uploader: 
-    cancel_all: "Zrušit všechny Uploads"
-    file_delete_permission_denied: "Nemáte dostatečná oprávnění k odstranění tohoto souboru."
+    cancel_all: "Zrušit všech uploadů"
+    file_delete_permission_denied: "Nemáte oprávnění smazat tento soubor."
     file_deleted: "Smazaný soubor"
-    file_upload_error: "Nastala chyba při nahrávání souboru."
-    javascript_not_enabled: "Je nám líto. SWFUpload nemohl načíst. Musíte mít povolen JavaScript těšit SWFUpload."
+    file_upload_error: "Vyskytla se chyba při nahrávání souboru."
+    javascript_not_enabled: "Je nám líto. SWFUpload nepodařilo načíst. Musíte mít povolen JavaScript těšit SWFUpload."
     manage_files: "Správa souborů"
-    manage_photos_files: "Správa Fotografie / Files"
-    missing_parent_id_error: "Prosím, zadejte nadřazeného objektu"
+    manage_photos_files: "Správa Fotografie / Archiv"
+    missing_parent_id_error: "Zadejte prosím rodiče objektu"
     permission_denied: "Nemáte oprávnění k dokončení této akce."
-    show_degraded_container: "Používáme standardní uploader"
-    show_swfupload_container: "Použít více-uploader souboru. (Vyžaduje Flash)"
-    standard_file_upload_error: "Nastala chyba při nahrávání souboru: {{error}}. Ujistěte se, že soubor je platný. Přesvědčte se, že soubor není prázdné. Pak zkuste to znovu."
+    show_degraded_container: "Použijte standardní přesouvat"
+    show_swfupload_container: "Používejte více-uploader souboru. (Vyžaduje Flash)"
+    standard_file_upload_error: "Vyskytla se chyba při nahrávání souboru: %{error}. Ujistěte se, že soubor je platný. Zkontrolujte, zda soubor není prázdný. Pak zkuste to znovu."
     successful_upload: "Úspěšně uploadovaný soubor."
-    swf_loading: "SWFUpload se nahrává. Prosím, vyčkejte chvíli ..."
-    swf_not_loading: "Je nám líto. SWFUpload nemohl načíst. Možná budete muset nainstalovat nebo upgradovat Flash Player. Navštivte {{url}} dostat Flash Player."
-    swf_taking_to_long: "SWFUpload bere dlouho zatížení nebo zatížení selhalo. Ujistěte se, že Flash Plugin je povoleno, a že pracovní verzi Adobe Flash Player je nainstalován."
-    upload_file: "Nahrát soubor"
+    swf_loading: "SWFUpload se načítá. Počkejte prosím chvíli ..."
+    swf_not_loading: "Je nám líto. SWFUpload nepodařilo načíst. Možná budete muset nainstalovat nebo aktualizovat Flash Player. Navštivte %{url} dostat Flash Player."
+    swf_taking_to_long: "SWFUpload trvá dlouho zatížení nebo zatížení selhala. Prosím, ujistěte se, že Flash Plugin je povoleno, a že pracovní verzi Adobe Flash Player je nainstalován."
+    upload_file: "Upload souborů"
     upload_files: "Upload souborů"

data/locales/da.yml

@@ -2,20 +2,20 @@
 da: 
   uploader: 
     cancel_all: "Annuller Alle Uploads"
-    file_delete_permission_denied: "Du har ikke tilladelse til at slette denne fil."
+    file_delete_permission_denied: "Du har ikke tilladelse til at slette den pågældende fil."
     file_deleted: "Slettet fil"
     file_upload_error: "Der opstod en fejl under overførsel af filen."
     javascript_not_enabled: "Vi beklager. SWFUpload kunne ikke indlæse. Du skal have Javascript aktiveret for at nyde SWFUpload."
-    manage_files: "Administrere filer"
-    manage_photos_files: "Administrer fotos / filer"
+    manage_files: "Administrer filer"
+    manage_photos_files: "Administrer Fotos / Files"
     missing_parent_id_error: "Angiv en forælder objekt"
     permission_denied: "Du har ikke tilladelse til at fuldføre denne handling."
     show_degraded_container: "Brug standard uploader"
-    show_swfupload_container: "Brug multiple-fil uploader. (Kræver Flash)"
-    standard_file_upload_error: "Der opstod en fejl under overførsel af filen: {{error}}. Sørg for, at filen er gyldig. Kontroller, at filen ikke er tom. Prøv igen."
+    show_swfupload_container: "Brug flere fil uploader. (Kræver Flash)"
+    standard_file_upload_error: "Der opstod en fejl under upload af filen: %{error}. Sørg for, at filen er gyldig. Kontroller, at filen ikke er tom. Prøv derefter igen."
     successful_upload: "Uploadet fil."
     swf_loading: "SWFUpload indlæses. Vent et øjeblik ..."
-    swf_not_loading: "Vi beklager. SWFUpload kunne ikke indlæse. Du skal muligvis installere eller opgradere Flash Player. Besøg {{url}} at få Flash Player."
-    swf_taking_to_long: "SWFUpload tager lang tid at indlæse eller belastningen er slået fejl. Sørg for, at Flash-plugin er aktiveret, og at en fungerende version af Adobe Flash Player er installeret."
-    upload_file: "Upload fil"
+    swf_not_loading: "Vi beklager. SWFUpload kunne ikke indlæse. Du skal muligvis installere eller opgradere Flash Player. Besøg %{url} at få Flash Player."
+    swf_taking_to_long: "SWFUpload tager lang tid at hente eller last mislykkedes. Vær sikker på, at Flash-plugin er aktiveret, og at en arbejdsgruppe version af Adobe Flash Player er installeret."
+    upload_file: "Upload File"
     upload_files: "Upload filer"

data/locales/de.yml

@@ -1,21 +1,21 @@
 --- 
 de: 
   uploader: 
-    cancel_all: "Stil Alle Uploads"
-    file_delete_permission_denied: "Sie haben keine Berechtigung, diese Datei zu löschen."
+    cancel_all: "Abbrechen Alle Uploads"
+    file_delete_permission_denied: "Sie haben keine Berechtigung, um die Datei zu löschen."
     file_deleted: "Gelöschte Datei"
     file_upload_error: "Fehler beim Hochladen der Datei."
-    javascript_not_enabled: "Es tut uns leid. SWFUpload konnte nicht geladen werden. Sie müssen JavaScript aktivieren, damit Sie genießen SWFUpload."
+    javascript_not_enabled: "Es tut uns leid. SWFUpload konnte nicht geladen werden. Sie müssen JavaScript aktivieren, damit Sie SWFUpload genießen."
     manage_files: "Dateien verwalten"
-    manage_photos_files: "Fotos verwalten / Files"
-    missing_parent_id_error: "Bitte geben Sie eine übergeordnete Objekt"
-    permission_denied: "Sie haben kein Recht, diese Maßnahme durchzuführen."
+    manage_photos_files: "Fotos verwalten / Dateien"
+    missing_parent_id_error: "Bitte geben Sie ein übergeordnetes Objekt"
+    permission_denied: "Sie haben keine Berechtigung, diese Aktion abzuschließen."
     show_degraded_container: "Verwenden Sie Standard-Uploader"
-    show_swfupload_container: "Verwenden Sie mehrere Datei-Uploader. (Benötigt Flash)"
-    standard_file_upload_error: "Fehler beim Hochladen der Datei: {{error}}. Bitte stellen Sie sicher, dass die Datei gültig ist. Überprüfen Sie, ob Sie die Datei nicht leer ist. Dann versuchen Sie es erneut."
-    successful_upload: "Erfolgreich hochgeladenen Datei."
+    show_swfupload_container: "Verwenden Sie mehrere Uploader-Datei. (Benötigt Flash)"
+    standard_file_upload_error: "Fehler beim Hochladen der Datei: %{error}. Bitte stellen Sie sicher, dass die Datei gültig ist. Überprüfen Sie, ob Sie die Datei nicht leer ist. Dann versuchen Sie es erneut."
+    successful_upload: "Erfolgreich hochgeladene Datei."
     swf_loading: "SWFUpload wird geladen. Bitte einen Moment warten ..."
-    swf_not_loading: "Es tut uns leid. SWFUpload konnte nicht geladen werden. Möglicherweise müssen Sie Flash Player installieren oder aktualisieren. Besuchen Sie die {{url}} man den Flash Player."
-    swf_taking_to_long: "SWFUpload dauert sehr lange Zeit zum Laden oder die Ladung ist fehlgeschlagen. Bitte stellen Sie sicher, dass das Flash-Plugin aktiviert ist und dass eine funktionierende Version des Adobe Flash Player installiert ist."
+    swf_not_loading: "Es tut uns leid. SWFUpload konnte nicht geladen werden. Möglicherweise müssen Sie installieren oder aktualisieren Flash Player. Besuchen Sie die %{url}, um die Flash Player."
+    swf_taking_to_long: "SWFUpload nimmt eine lange Zeit zu laden oder die Last ist fehlgeschlagen. Bitte stellen Sie sicher, dass das Flash-Plugin aktiviert ist und dass eine funktionierende Version des Adobe Flash Player installiert ist."
     upload_file: "Upload File"
-    upload_files: "Dateien hochladen"
+    upload_files: "Upload von Dateien"

data/locales/el.yml

@@ -1,21 +1,21 @@
 --- 
 el: 
   uploader: 
-    cancel_all: "Να ακυρώσει όλες τις προσθέσεις του"
-    file_delete_permission_denied: "Δεν έχετε δικαίωμα να διαγράψετε το αρχείο."
+    cancel_all: "Ακύρωση όλων των Uploads"
+    file_delete_permission_denied: "Δεν έχετε άδεια για να διαγράψετε το αρχείο."
     file_deleted: "Διαγράφεται αρχείο"
-    file_upload_error: "Παρουσιάστηκε σφάλμα κατά τη μεταφόρτωση του αρχείου."
-    javascript_not_enabled: "Λυπόμαστε. SWFUpload δεν μπορούσε φορτίο. Θα πρέπει να έχετε ενεργοποιημένη τη Javascript για να απολαύσετε SWFUpload."
-    manage_files: "Διαχειριστείτε αρχεία"
+    file_upload_error: "Προέκυψε σφάλμα κατά τη μεταφόρτωση του αρχείου."
+    javascript_not_enabled: "Λυπούμαστε. SWFUpload δε μπορεί να φορτώσει. Θα πρέπει να έχετε ενεργοποιημένη τη Javascript για να απολαύσετε SWFUpload."
+    manage_files: "Διαχείριση Αρχείων"
     manage_photos_files: "Διαχειριστείτε Φωτογραφίες / Αρχεία"
-    missing_parent_id_error: "Να αναφερθεί ένα αντικείμενο μητρική"
-    permission_denied: "Δεν έχετε την άδεια για την ολοκλήρωση αυτής της δράσης."
-    show_degraded_container: "Χρήση πρότυπο uploader"
-    show_swfupload_container: "Χρήση πολλαπλών αρχείων uploader. (Requires Flash)"
-    standard_file_upload_error: "Παρουσιάστηκε σφάλμα κατά τη μεταφόρτωση του αρχείου: {{error}}. Βεβαιωθείτε ότι ο φάκελος είναι έγκυρη. Ελέγξτε για να βεβαιωθείτε ότι το αρχείο δεν είναι άδειο. Στη συνέχεια, προσπαθήστε ξανά."
-    successful_upload: "Επιτυχώς προστιθέμενο αρχείο."
-    swf_loading: "SWFUpload φορτώνει. Παρακαλώ περιμένετε ένα λεπτό ..."
-    swf_not_loading: "Λυπόμαστε. SWFUpload δεν μπορούσε φορτίο. Μπορεί να χρειαστεί να εγκαταστήσετε ή να αναβαθμίσετε τον Flash Player. Επισκεφθείτε την {{url}} να πάρει το Flash Player."
-    swf_taking_to_long: "SWFUpload παίρνει πολύ χρόνο για να φορτώσει ή το φορτίο έχει αποτύχει. Παρακαλούμε βεβαιωθείτε ότι το Flash Plugin είναι ενεργοποιημένη και ότι με μια λειτουργική έκδοση του Adobe Flash Player είναι εγκατεστημένος."
-    upload_file: "Upload File"
-    upload_files: "Upload Files"
+    missing_parent_id_error: "Προσδιορίστε ένα γονικό αντικείμενο"
+    permission_denied: "Δεν έχετε άδεια για να ολοκληρώσει τη δράση αυτή."
+    show_degraded_container: "Χρησιμοποιήστε το πρότυπο uploader"
+    show_swfupload_container: "Χρήση πολλαπλών αρχείων uploader. (Απαιτεί Flash)"
+    standard_file_upload_error: "Προέκυψε σφάλμα κατά τη μεταφόρτωση του αρχείου: %{error}. Παρακαλώ βεβαιωθείτε ότι το αρχείο είναι έγκυρο. Ελέγξτε για να βεβαιωθείτε ότι το αρχείο δεν είναι κενός. Στη συνέχεια, προσπαθήστε ξανά."
+    successful_upload: "Επιτυχώς φορτώθηκε το αρχείο."
+    swf_loading: "SWFUpload φορτώνει. Περιμένετε ένα λεπτό ..."
+    swf_not_loading: "Λυπούμαστε. SWFUpload δε μπορεί να φορτώσει. Μπορεί να χρειαστεί να εγκαταστήσετε ή να αναβαθμίσετε τον Flash Player. Επισκεφθείτε την %{url} να πάρει το Flash Player."
+    swf_taking_to_long: "SWFUpload παίρνει πολύ χρόνο για να φορτώσει ή του φορτίου έχει αποτύχει. Παρακαλώ βεβαιωθείτε ότι το Flash Plugin είναι ενεργοποιημένη και ότι μια λειτουργική έκδοση του Adobe Flash Player είναι εγκατεστημένο."
+    upload_file: "Ανέβασμα αρχείου"
+    upload_files: "Ανέβασμα Αρχείων"