olelo 0.9.4 → 0.9.5

data/.gitignore

@@ -1,6 +1,5 @@
 *.log
 *.swp
-*.rbc
 .wiki
 .yardoc
 config.yml

data/.travis.yml

@@ -1,4 +1,12 @@
 rvm:
+  - 1.9.2
   - 1.9.3
   - ruby-head
   - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
+# HACK: Fix problems with native libraries on ruby-head
+before_install:
+  - gem install rugged -v 0.17.0.b7 -- --with-cflags='--std=gnu99'
+  - gem install nokogiri redcarpet -- --with-cflags='--std=gnu99'

data/README.creole

@@ -1,5 +1,9 @@
 = Ōlelo Wiki
 
+[[https://travis-ci.org/minad/olelo|{{https://secure.travis-ci.org/minad/olelo.png?branch=master|Build Status}}]]
+[[https://gemnasium.com/minad/olelo|{{https://gemnasium.com/minad/olelo.png?travis|Dependency Status}}]]
+[[https://codeclimate.com/github/minad/olelo|{{https://codeclimate.com/badge.png|Code Climate}}]]
+
 Ōlelo is a wiki that stores pages in a [[http://git-scm.org/|Git]] repository, supports many markup styles and has an extensible, hackable architecture!
 If you want to see a demo installation go to http://www.gitwiki.org/.
 
@@ -13,6 +17,7 @@ Core features:
 * Support for hierarchical wikis (directory structure)
 * File upload
 * History, commit and diff view
+* Locales, currently supported languages Czech, English, French, German
 
 Features, implemented by plugins:
 * Support for many markup languages (Creole, Markdown, Textile, ...)
@@ -22,7 +27,7 @@ Features, implemented by plugins:
 * Syntax highlighted embedded code blocks
 * Image resizing, SVG to PNG/JPEG conversion
 * Auto-generated table of contents
-* Wiki syntax can be extended with tags
+* Wiki syntax can be extended with tags (gist, math, footnotes, ...)
 * Editor preview
 * View pages as S5 presentation
 * Privacy features: Access control lists, Private wiki which needs login, readonly wiki
@@ -41,7 +46,7 @@ Go to a git repository via command line and start the Ōlelo webserver.
 $ olelo
 }}}
 
-Point your web browser at http://localhost:8080/.
+Point your web browser at http://localhost:8080/. This is all you have to do, now you are good to go to use your wiki!
 
 == Installation from source
 
@@ -74,25 +79,22 @@ For production purposes, I recommend that you deploy the wiki with [[http://unic
 $ unicorn path-to/config.ru
 }}}
 
-Unicorn is a very flexible ruby application server and Ōlelo runs very well on it. You can adapt the number of Unicorn workers depending on the load you expect. It is
-a good idea to observe the Unicorn workers as described in https://github.com/blog/519-unicorn-god and kill missbehaving workers if necessary.
+Unicorn is a very flexible ruby application server and Ōlelo runs very well on it. You can adapt the number of Unicorn workers depending on the load you expect. It is a good idea to observe the Unicorn workers as described in https://github.com/blog/519-unicorn-god and kill missbehaving workers if necessary.
 
 == Configuration
 
-For deployment you might want to tweak some settings. Ōlelo reads the files config/config.yml.default and config/config.yml in that order.
-So just copy the default configuration config/config.yml.default to config/config.yml and make your modifications. If you installed Ōlelo
-as gem this is not a good idea since you don't want to fiddle in the gem directory. For this purpose exists the environment variable OLELO_CONFIG which
+For deployment you might want to tweak some settings. Ōlelo reads the files 'config/config.yml.default' and 'config/config.yml' in that order. So just copy the default configuration 'config/config.yml.default' to 'config/config.yml' and make your modifications. If you installed Ōlelo as gem this is not a good idea since you don't want to fiddle in the gem directory. For this purpose the environment variable '$OLELO_CONFIG' exists which
 can point to the configuration file that you want to use.
 
 {{{
 export OLELO_CONFIG=/home/olelo/olelo_config.yml
 }}}
 
-You can also use the OLELO_CONFIG environment variable if you want to run multiple Ōlelo instances with different configurations.
+You can also use the '$OLELO_CONFIG' environment variable if you want to run multiple Ōlelo instances with different configurations, for example to serve different pages from different repositories.
 
 == Dependencies
 
-If you use Bundler or installed Ōlelo as gem you don't really have to care about the dependencies. The standard installation provides the core dependencies and a good selection of optional dependencies.
+If you installed Ōlelo as gem or used Bundler you don't really have to care about the dependencies. The standard installation provides the core dependencies and a good selection of optional dependencies.
 
 Core dependencies:
 * [[http://www.git-scm.com|Git]]
@@ -109,15 +111,33 @@ Some dependencies are optional, for example depending on the markup you want to
 * [[http://nokogiri.org/|Nokogiri for auto-generated table of contents]]
 * [[http://pygments.org/|Pygments for syntax highlighting of code blocks]]
 
+== Development
+
+=== Important concepts
+
+* Plugin architecture
+* Aspects under 'plugins/aspects' which provide different 'views' for a page
+* Filters under 'plugins/filters' which make it possible to build up aspects from a filter chain.
+  These aspects are configured under 'config/aspects.rb'
+* Tags are provided by the 'plugins/tags/main.rb' plugin and can be integrated in a filter chain.
+  They look like html tags and can be used to extend the wiki syntax.
+
+=== Tipps
+
+* Execute 'rake --tasks' to see the available development tasks
+* Activate development mode by setting the option 'production: false' in 'config/config.yml'
+* Increase the log verbosity by setting 'log.level: DEBUG' in 'config/config.yml'
+* Do not hesitate to create an issue at the [[https://github.com/minad/olelo/issues|issue tracker]]
+
 == Authors
 
-Git-Wiki was originally developed by Simon Rozet. The development of Ōlelo to its current state was done by Daniel Mendler and contributors.
-The current code base doesn't have much in common with the original Git-Wiki proof-of-concept.
+Git-Wiki was originally developed by Simon Rozet. The development of Ōlelo to its current state was done by Daniel Mendler and contributors. The current code base doesn't have much in common with the original Git-Wiki proof-of-concept.
 
 Contributors:
 * Alex Eagle
 * Alex Wall
 * Hrvoje
+* Korthaerd
 * Luca Greco
 * Pavel Suchmann
 * Raffael Schmid

data/Rakefile

@@ -1,4 +1,4 @@
-task default: %w(test:spec)
+task default: :test
 
 def shrink_js(t)
   #sh "cat #{t.prerequisites.sort.join(' ')} > #{t.name}"
@@ -42,21 +42,14 @@ namespace :gen do
   task css: %w(static/themes/atlantis/style.css
                   plugins/treeview/treeview.css
                   plugins/utils/pygments.css
-                  plugins/gallery/gallery.css
+                  plugins/aspects/gallery/gallery.css
                   plugins/misc/fancybox/jquery.fancybox.css
                   plugins/blog/blog.css)
 end
 
-namespace :test do
-  desc 'Run tests with bacon'
-  task spec: FileList['test/*_test.rb'] do |t|
-    sh "bacon -q -Ilib:test #{t.prerequisites.join(' ')}"
-  end
-
-  desc 'Generate test coverage report'
-  task rcov: FileList['test/*_test.rb'] do |t|
-    sh "rcov -Ilib:test #{t.prerequisites.join(' ')}"
-  end
+desc 'Run tests with bacon'
+task test: FileList['test/*_test.rb'] do |t|
+  sh "bacon -q -Ilib:test test/run.rb"
 end
 
 desc 'Cleanup'
@@ -67,19 +60,51 @@ task :clean do |t|
   FileUtils.rm_rf '.wiki/log'
 end
 
-desc 'Generate documentation'
 namespace :doc do
-  task :gen    do; system("yard doc -o doc/api 'lib/**/*.rb' 'plugins/**/*.rb'"); end
-  task :server do; system('yard server --reload'); end
-  task :check  do; system("yardcheck 'lib/**/*.rb' 'plugins/**/*.rb'"); end
+  desc 'Generate documentation'
+  task :gen    do; sh "yard doc -o doc/api 'lib/**/*.rb' 'plugins/**/*.rb'"; end
+
+  desc 'Start YARD documentation server'
+  task :server do; sh 'yard server --reload'; end
+
+  desc 'Check YARD documentation'
+  task :check  do; sh "yardcheck 'lib/**/*.rb' 'plugins/**/*.rb'"; end
+end
+
+namespace :locale do
+  desc 'Sort locale yaml files'
+  task :sort do
+    # You need the i18n_yaml_sorter gem
+    Dir['**/locale.yml'].each do |file|
+      puts "Sorting #{file}"
+      system("sort_yaml < #{file} > #{file}.sorted; mv #{file}.sorted #{file}")
+    end
+  end
+
+  desc 'Check locales for missing keys'
+  task :check do
+    require 'yaml'
+    Dir['**/locale.yml'].each do |file|
+      puts "Checking #{file}"
+      translations = YAML.load_file(file)
+      puts 'en locale missing' unless translations['en']
+      keys = translations['en'].keys
+      translations.each do |locale,hash|
+        delta = hash.keys - keys
+        puts "\tLocale #{locale} has additional keys #{delta.join(' ')}" unless delta.empty?
+        delta = keys - hash.keys
+        puts "\tLocale #{locale} has missing keys #{delta.join(' ')}" unless delta.empty?
+      end
+    end
+  end
 end
 
 namespace :notes do
-  task :todo      do; system('ack T''ODO');      end
-  task :fixme     do; system('ack F''IXME');     end
-  task :hack      do; system('ack H''ACK');      end
-  task :warning   do; system('ack W''ARNING');   end
-  task :important do; system('ack I''MPORTANT'); end
+  task :todo      do; sh('ack T''ODO');      end
+  task :fixme     do; sh('ack F''IXME');     end
+  task :hack      do; sh('ack H''ACK');      end
+  task :warning   do; sh('ack W''ARNING');   end
+  task :important do; sh('ack I''MPORTANT'); end
 end
 
 desc 'Show annotations'

data/config/aspects.rb

@@ -67,7 +67,8 @@ aspect :page do
       remove_comments.tag_shortcuts
       creole_nowiki.tag { creole!.rubypants }
     end
-    toc.interwiki(map: interwiki_map).link_classifier
+    fix_image_links.toc
+    interwiki(map: interwiki_map).link_classifier
   end
 end
 
@@ -78,7 +79,8 @@ aspect :s5 do
   filter do
     remove_comments.tag_shortcuts
     creole_nowiki.tag { creole!.rubypants }
-    toc.interwiki(map: interwiki_map).link_classifier
+    fix_image_links.toc
+    interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
 end
@@ -90,7 +92,7 @@ aspect :latex do
   filter do
     remove_comments.tag_shortcuts.creole_nowiki
     tag(static: true) { creole!.rubypants }
-    toc.interwiki(map: interwiki_map)
+    interwiki(map: interwiki_map)
     html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
   end
 end
@@ -107,7 +109,8 @@ aspect :page do
       remove_comments.tag_shortcuts
       mediawiki_nowiki.tag { mediawiki!.rubypants }
     end
-    toc.interwiki(map: interwiki_map).link_classifier
+    fix_image_links.toc
+    interwiki(map: interwiki_map).link_classifier
   end
 end
 
@@ -118,7 +121,8 @@ aspect :s5 do
   filter do
     remove_comments.tag_shortcuts
     mediawiki_nowiki.tag { mediawiki!.rubypants }
-    toc.interwiki(map: interwiki_map).link_classifier
+    fix_image_links.toc
+    interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
 end
@@ -130,7 +134,7 @@ aspect :latex do
   filter do
     remove_comments.tag_shortcuts.mediawiki_nowiki
     tag(static: true) { mediawiki!.rubypants }
-    toc.interwiki(map: interwiki_map)
+    interwiki(map: interwiki_map)
     html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
   end
 end
@@ -145,7 +149,7 @@ aspect :page do
   filter do
     remove_comments.tag_shortcuts.textile_nowiki
     tag(disable: 'html:*') { textile!.rubypants }
-    fix_img_tag.toc
+    fix_image_links.toc
     interwiki(map: interwiki_map).link_classifier
   end
 end
@@ -157,7 +161,7 @@ aspect :s5 do
   filter do
     remove_comments.tag_shortcuts.textile_nowiki
     tag(disable: 'html:*') { textile!.rubypants }
-    fix_img_tag.toc
+    fix_image_links.toc
     interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
@@ -170,7 +174,7 @@ aspect :latex do
   filter do
     remove_comments.tag_shortcuts.textile_nowiki
     tag(static: true, disable: 'html:*') { textile!.rubypants }
-    toc.interwiki(map: interwiki_map)
+    interwiki(map: interwiki_map)
     html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
   end
 end
@@ -187,7 +191,7 @@ aspect :page do
       remove_comments.tag_shortcuts.markdown_nowiki
       tag(disable: 'html:*') { markdown! }
     end
-    fix_img_tag.toc
+    fix_image_links.toc
     interwiki(map: interwiki_map).link_classifier
   end
 end
@@ -199,7 +203,7 @@ aspect :s5 do
   filter do
     remove_comments.tag_shortcuts.markdown_nowiki
     tag(disable: 'html:*') { markdown! }
-    fix_img_tag.toc
+    fix_image_links.toc
     interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
@@ -212,7 +216,7 @@ aspect :latex do
   filter do
     remove_comments.tag_shortcuts.markdown_nowiki
     tag(static: true, disable: 'html:*') { markdown! }
-    toc.interwiki(map: interwiki_map)
+    interwiki(map: interwiki_map)
     html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
   end
 end
@@ -227,7 +231,7 @@ aspect :page do
   filter do
     remove_comments.tag_shortcuts
     tag { orgmode!.rubypants }
-    fix_img_tag.toc
+    fix_image_links.toc
     interwiki(map: interwiki_map).link_classifier
   end
 end
@@ -239,7 +243,7 @@ aspect :s5 do
   filter do
     remove_comments.tag_shortcuts
     tag { orgmode!.rubypants }
-    fix_img_tag.toc
+    fix_image_links.toc
     interwiki(map: interwiki_map).link_classifier
     html_wrapper!.s5!
   end
@@ -252,7 +256,7 @@ aspect :latex do
   filter do
     remove_comments.tag_shortcuts
     tag(static: true) { orgmode!.rubypants }
-    toc.interwiki(map: interwiki_map)
+    interwiki(map: interwiki_map)
     html_wrapper!.xslt!(stylesheet: 'xhtml2latex.xsl')
   end
 end

data/lib/olelo/application.rb

@@ -154,10 +154,9 @@ module Olelo
 
     get '/history(/:path)' do
       per_page = 30
-      limit = 90
       @page = Page.find!(params[:path])
       @page_nr = [params[:page].to_i, 1].max
-      @history = page.history((@page_nr - 1) * per_page, limit)
+      @history = page.history((@page_nr - 1) * per_page, per_page)
       @page_count = @page_nr + @history.length / per_page
       @history = @history[0...per_page]
       cache_control version: page.version
@@ -205,7 +204,7 @@ module Olelo
 
     get '/edit(/:path)' do
       @page = Page.find!(params[:path])
-      flash.info!(:info_binary.t(page: page.title, type: "#{page.mime.comment} (#{page.mime})")) unless page.mime.text?
+      flash.info!(:info_binary.t(page: page.title, type: "#{page.mime.comment} (#{page.mime})")) unless page.editable?
       render :edit
     end
 

data/lib/olelo/extensions.rb

@@ -1,4 +1,7 @@
 class Module
+  # HACK: private_constant was introduced in 1.9.3
+  def private_constant(*args); end unless respond_to?(:private_constant)
+
   # Generate accessor method with question mark
   #
   # @param [String, Symbol...] attrs Attributes to generate setter for

data/lib/olelo/helper.rb

@@ -58,6 +58,7 @@ module Olelo
 
     def pagination(path, page_count, page_nr, options = {})
       return if page_count <= 1
+      unlimited = options.delete(:unlimited)
       li = []
       li << if page_nr > 1
               %{<a href="#{escape_html build_path(path, options.merge(page: page_nr - 1))}">&#9666;</a>}
@@ -86,11 +87,12 @@ module Olelo
       if max != page_count
         li << %{<span class="ellipsis"/>} << %{<a href="#{escape_html build_path(path, options.merge(page: page_count))}">#{page_count}</a>}
       end
-      li << if page_nr < page_count
-              %{<a href="#{escape_html build_path(path, options.merge(page: page_nr + 1))}">&#9656;</a>}
-            else
-              %{<span class="disabled">&#9656;</span>}
-            end
+      if page_nr < page_count
+        li << %{<span class="ellipsis"/>} if unlimited
+        li << %{<a href="#{escape_html build_path(path, options.merge(page: page_nr + 1))}">&#9656;</a>}
+      else
+        li << %{<span class="disabled">&#9656;</span>}
+      end
       ('<ul class="pagination">' + li.map {|x| "<li>#{x}</li>"}.join + '</ul>').html_safe
     end
 

data/lib/olelo/locale.rb

@@ -41,7 +41,7 @@ module Olelo
         if !key.to_s.ends_with?('_plural') && args[:count] && args[:count] != 1
           translate("#{key}_plural", args)
         elsif @translations[key]
-          args.inject(@translations[key]) {|s,(k,v)| s.gsub("#\{#{k}\}", v.to_s) }
+          @translations[key] % args
         else
           args[:fallback] || "##{key}"
         end

data/lib/olelo/locale.yml

@@ -1,132 +1,139 @@
-en:
-  access_denied:          'Access denied'
-  actions:                'Actions'
-  already_exists:         '#{page} exists already'
+cs_CZ:
+  access_denied:          'Přístup odepřen'
+  actions:                'Akce'
+  already_exists:         'Stránka %{page} již existuje'
   attribute_mime:         'Mime-Type'
-  attribute_no_title:     'Disable title'
-  attribute_title:        'Title'
-  attributes:             'Attributes'
-  attributes_edited:      'Attributes of #{page} edited'
-  author:                 'Author'
-  binary_file:            'Binary file'
-  by:                     'by'
-  cancel:                 'Cancel'
-  change_password:        'Change password'
-  changes:                'Changes'
-  changes_of:             'Changes of #{page}'
-  changes_saved:          'Changes saved'
-  comment:                'Comment'
-  compare:                'Compare #{name}'
-  confirm_password:       'Confirm password'
-  head:                   'Head'
-  create_page:            'Create #{page}'
-  create_redirect:        'Create redirect'
-  date:                   'Date'
-  delete:                 'Delete'
-  deleted:                'Deleted'
-  delete_page:            'Delete #{page}'
-  description:            'Description'
-  destination:            'Destination'
-  edit:                   'Edit'
-  edit_page:              'Editing #{page}'
-  edit_page_section:      'Editing #{page} (Section)'
-  email:                  'E-Mail'
-  empty_password:         'Empty password'
-  info_binary:            '#{page} is a binary #{type} and cannot be edited like a text file.'
-  error_occurred:         'Oh snap! An error occurred.'
-  file:                   'File'
-  groups:                 'Groups'
-  history:                'History'
-  history_of:             'History of #{page}'
-  invalid_email:          'E-Mail is invalid'
-  invalid_mime_type:      'Invalid mime type'
-  invalid_name:           'Name is invalid'
-  invalid_path:           'Invalid path'
-  last_modified:          'Last modified'
-  login:                  'Login'
-  logout:                 'Logout'
-  menu_actions_edit_new:  'New Page'
-  move:                   'Move'
-  move_page:              'Move #{page}'
-  name:                   'Name'
-  newer:                  'Newer'
-  new_page:               'New Page'
-  no_changes:             'No changes'
-  old_password:           'Old password'
-  page:                   'Page'
-  page_edited:            '#{page} edited'
-  page_not_found:         'Sorry, the page you were looking for was not found.'
-  page_uploaded:          'Page #{page} uploaded'
-  password:               'Password'
-  passwords_do_not_match: 'Passwords do not match'
-  parents:                'Parents'
-  path:                   'Path'
-  profile_title:          'Profile of #{user}'
-  really_delete:          'Really delete?'
-  reserved_path:          'Path is reserved'
+  attribute_no_title:     'Skrýt titulek'
+  attribute_title:        'Titulek'
+  attributes:             'Atributy'
+  attributes_edited:      'Atributy stránky %{page} editovány'
+  author:                 'Autor'
+  binary_file:            'Binární soubor'
+  cancel:                 'Zrušit'
+  change_password:        'Změnit heslo'
+  changes:                'Změny'
+  changes_of:             'Změny stránky %{page}'
+  changes_saved:          'Změny uloženy'
+  comment:                'Komentář'
+  compare:                'Porovnat %{name}'
+  confirm_password:       'Potvrdit heslo'
+  create_page:            'Vytvořit stránku %{page}'
+  create_redirect:        'Vytvořit přesměrování'
+  date:                   'Datum'
+  delete:                 'Smazat'
+  delete_page:            'Smazat stránku %{page}'
+  deleted:                'Smazáno'
+  description:            'Popis'
+  destination:            'Cíl'
+  edit:                   'Editovat'
+  edit_page:              'Editace stránky %{page}'
+  edit_page_section:      'Editovat %{page} (Sekci)'
+  email:                  'e-mail'
+  empty_password:         'Prázdné heslo'
+  error_occurred:         'Ouvej! Vyskytla se chyba.'
+  file:                   'Soubor'
+  groups:                 'Skupiny'
+  head:                   'Nejnovější'
+  history:                'Historie'
+  history_of:             'Historie stránky %{page}'
+  info_binary:            'Stránka %{page} je binární typ %{type} a nemůže být editována jako textový soubor.'
+  invalid_email:          'e-mail je neplatný'
+  invalid_mime_type:      'mime-type je neplatný'
+  invalid_name:           'Jméno je neplatné'
+  invalid_path:           'Neplatná cesta'
+  last_modified:          'Poslední modifikace'
+  login:                  'Přihlášení'
+  logout:                 'Odhlášení'
+  menu_actions_edit:      'Editovat'
+  menu_actions_edit_delete: 'Smazat'
+  menu_actions_edit_move: 'Přesunout'
+  menu_actions_edit_new:  'Nová stránka'
+  menu_actions_history:   'Historie'
+  menu_actions_history_head: 'Aktuální'
+  menu_actions_history_newer: 'Novější'
+  menu_actions_history_older: 'Starší'
+  menu_actions_view:      'Zobrazit'
+  move:                   'Přesunout'
+  move_page:              'Přesunout stránku %{page}'
+  name:                   'Jméno'
+  new_page:               'Nová stránka'
+  no_changes:             'Žádné změny'
+  not_found_text:         'Pardon, stránka, kterou hledáte, nebyla nalezena.'
+  old_password:           'Staré heslo'
+  page:                   'Stránka'
+  page_deleted:           'Stránka %{page} smazána.'
+  page_edited:            'Stránka %{page} editována'#
+  not_found_title:        '404 Not found'
+  page_moved:             'Stránka %{page} přesunuta do %{destination}.'
+  page_uploaded:          'Stránka %{page} nahrána'
+  parents:                'Rodiče'
+  password:               'Heslo'
+  passwords_do_not_match: 'Hesla se neshodují'
+  path:                   'Cesta'
+  profile_title:          'Profil uživatele %{user}'
+  really_delete:          'Opravdu smazat?'
+  reserved_path:          'Cesta je rezervována'
   reset:                  'Reset'
-  root:                   'Root'
-  page_deleted:           '#{page} deleted.'
-  page_moved:             '#{page} moved to #{destination}.'
-  save:                   'Save'
-  save_and_close:         'Save & Close'
-  search:                 'Search'
-  settings:               'Settings'
-  signup:                 'Sign up'
-  summary:                'Summary'
+  root:                   'Hlavní strana'
+  save:                   'Uložit'
+  save_and_close:         'Uložit a zavřít'
+  search:                 'Hledat'
+  settings:               'Nastavení'
+  signup:                 'Registrovat se'
+  summary:                'Souhrn'
   text:                   'Text'
-  title:                  'Title'
-  tree:                   'Tree'
-  type_select:            'Select value'
-  type_stringlist:        'Comma-separated strings'
-  upload_file:            'Upload file'
-  upload:                 'Upload'
-  user:                   'User'
-  user_already_exists:    'User #{name} already exists'
-  version:                'Version'
-  version_conflict:       'Version conflict detected'
-  wrong_user_or_pw:       'Wrong username or password'
-  wrong_password:         'Wrong password'
+  title:                  'Titulek'
+  tree:                   'Strom'
+  type_select:            'Vybrat hodnotu'
+  type_stringlist:        'Řetězce oddělené čárkou'
+  upload:                 'Nahrát'
+  upload_file:            'Nahrát soubor'
+  user:                   'Uživatel'
+  user_already_exists:    'Uživatel %{name} již existuje'
+  version:                'Verze'
+  version_by:             'Verze %{version} od %{author}, %{date}'
+  version_conflict:       'Detekován konflikt verzí'
+  wrong_password:         'Chybné heslo'
+  wrong_user_or_pw:       'Chybné jméno uživatele nebo heslo'
 de:
   access_denied:          'Zugriff verweigert'
   actions:                'Aktionen'
-  already_exists:         '#{page} existiert bereits'
+  already_exists:         '%{page} existiert bereits'
   attribute_mime:         'Mime-Typ'
   attribute_no_title:     'Titel deaktivieren'
   attribute_title:        'Titel'
   attributes:             'Attribute'
-  attributes_edited:      'Attribute von #{page} bearbeitet'
+  attributes_edited:      'Attribute von %{page} bearbeitet'
   author:                 'Autor'
   binary_file:            'Binärdatei'
-  by:                     'von'
   cancel:                 'Abbrechen'
   change_password:        'Passwort ändern'
   changes:                'Änderungen'
-  changes_of:             'Änderungen von #{page}'
+  changes_of:             'Änderungen von %{page}'
   changes_saved:          'Änderungen gespeichert'
   comment:                'Kommentar'
-  compare:                'Vergleiche #{name}'
+  compare:                'Vergleiche %{name}'
   confirm_password:       'Bestätige Passwort'
-  head:                   'Kopf'
-  create_page:            'Neue #{page}'
+  create_page:            'Neue %{page}'
   create_redirect:        'Weiterleitung'
   date:                   'Datum'
   delete:                 'Löschen'
+  delete_page:            'Lösche %{page}'
   deleted:                'Gelöscht'
-  delete_page:            'Lösche #{page}'
   description:            'Beschreibung'
   destination:            'Ziel'
   edit:                   'Bearbeiten'
-  edit_page:              'Bearbeite #{page}'
-  edit_page_section:      'Bearbeite #{page} (Bereich)'
+  edit_page:              'Bearbeite %{page}'
+  edit_page_section:      'Bearbeite %{page} (Bereich)'
   email:                  'E-Mail'
   empty_password:         'Leeres Passwort'
-  info_binary:            '#{page} ist eine Datei mit dem Typ #{type} und kann nicht wie eine Textdatei bearbeitet werden.'
   error_occurred:         'Hoppla! Es ist ein Fehler aufgetreten.'
   file:                   'Datei'
   groups:                 'Gruppen'
+  head:                   'Kopf'
   history:                'Historie'
-  history_of:             'Historie von #{page}'
+  history_of:             'Historie von %{page}'
+  info_binary:            '%{page} ist eine Datei mit dem Typ %{type} und kann nicht wie eine Textdatei bearbeitet werden.'
   invalid_email:          'E-Mail ist ungültig'
   invalid_mime_type:      'Mime-Typ ist ungültig'
   invalid_name:           'Name ist ungültig'
@@ -143,26 +150,28 @@ de:
   menu_actions_history_older: 'Älter'
   menu_actions_view:      'Ansicht'
   move:                   'Verschieben'
-  move_page:              'Verschiebe #{page}'
+  move_page:              'Verschiebe %{page}'
   name:                   'Name'
   new_page:               'Neue Seite'
   no_changes:             'Keine Änderungen'
+  not_found_text:         'Die Seite wurde leider nicht gefunden.'
+  not_found_title:        '404 Nicht gefunden'
   old_password:           'Altes Passwort'
   page:                   'Seite'
-  page_edited:            '#{page} edited'
-  page_not_found:         'Die Seite wurde leider nicht gefunden.'
-  page_uploaded:          'Seite #{page} hochgeladen'
+  page_deleted:           '%{page} gelöscht.'
+  page_edited:            '%{page} bearbeitet'
+  page_moved:             '%{page} verschoben nach %{destination}.'
+  page_uploaded:          'Seite %{page} hochgeladen'
+  parents:                'Eltern'
   password:               'Passwort'
   passwords_do_not_match: 'Passwörter stimmen nicht überein'
-  parents:                'Eltern'
   path:                   'Pfad'
-  profile_title:          'Profil von #{user}'
+  powered_by:             'Powered by <a href="https://github.com/minad/olelo">&#332;lelo</a>'
+  profile_title:          'Profil von %{user}'
   really_delete:          'Wirklich löschen?'
   reserved_path:          'Pfad ist reserviert'
   reset:                  'Zurücksetzen'
   root:                   'Root'
-  page_deleted:           '#{page} gelöscht.'
-  page_moved:             '#{page} verschoben nach #{destination}.'
   save:                   'Speichern'
   save_and_close:         'Speichern & Schließen'
   search:                 'Suche'
@@ -171,111 +180,196 @@ de:
   summary:                'Zusammenfassung'
   text:                   'Text'
   title:                  'Titel'
+  tree:                   'Baum'
   type_select:            'Wert auswählen'
   type_stringlist:        'Durch Komma getrennte Strings'
-  tree:                   'Baum'
-  upload_file:            'Datei hochladen'
   upload:                 'Hochladen'
+  upload_file:            'Datei hochladen'
   user:                   'Benutzer'
-  user_already_exists:    'Benutzer #{name} existiert bereits'
+  user_already_exists:    'Benutzer %{name} existiert bereits'
   version:                'Version'
+  version_by:             'Version %{version} von %{author}, %{date}'
   version_conflict:       'Versionskonflikt aufgetreten'
-  wrong_user_or_pw:       'Falscher Benutzername oder falsches Passwort'
   wrong_password:         'Falsches Passwort'
-cs_CZ:
-  access_denied:          'Přístup odepřen'
-  actions:                'Akce'
-  already_exists:         'Stránka #{page} již existuje'
+  wrong_user_or_pw:       'Falscher Benutzername oder falsches Passwort'
+en:
+  access_denied:          'Access denied'
+  actions:                'Actions'
+  already_exists:         '%{page} exists already'
   attribute_mime:         'Mime-Type'
-  attribute_no_title:     'Skrýt titulek'
-  attribute_title:        'Titulek'
-  attributes:             'Atributy'
-  attributes_edited:      'Atributy stránky #{page} editovány'
-  author:                 'Autor'
-  binary_file:            'Binární soubor'
-  by:                     'od'
-  cancel:                 'Zrušit'
-  change_password:        'Změnit heslo'
-  changes:                'Změny'
-  changes_of:             'Změny stránky #{page}'
-  changes_saved:          'Změny uloženy'
-  comment:                'Komentář'
-  compare:                'Porovnat #{name}'
-  confirm_password:       'Potvrdit heslo'
-  head:                   'Nejnovější'
-  create_page:            'Vytvořit stránku #{page}'
-  create_redirect:        'Vytvořit přesměrování'
-  date:                   'Datum'
-  delete:                 'Smazat'
-  deleted:                'Smazáno'
-  delete_page:            'Smazat stránku #{page}'
-  description:            'Popis'
-  destination:            'Cíl'
-  edit:                   'Editovat'
-  edit_page:              'Editace stránky #{page}'
-  edit_page_section:      'Editovat #{page} (Sekci)'
-  email:                  'e-mail'
-  empty_password:         'Prázdné heslo'
-  info_binary:            'Stránka #{page} je binární typ #{type} a nemůže být editována jako textový soubor.'
-  error_occurred:         'Ouvej! Vyskytla se chyba.'
-  file:                   'Soubor'
-  groups:                 'Skupiny'
-  history:                'Historie'
-  history_of:             'Historie stránky #{page}'
-  invalid_email:          'e-mail je neplatný'
-  invalid_mime_type:      'mime-type je neplatný'
-  invalid_name:           'Jméno je neplatné'
-  invalid_path:           'Neplatná cesta'
-  last_modified:          'Poslední modifikace'
-  login:                  'Přihlášení'
-  logout:                 'Odhlášení'
-  menu_actions_edit:      'Editovat'
-  menu_actions_edit_delete: 'Smazat'
-  menu_actions_edit_move: 'Přesunout'
-  menu_actions_edit_new:  'Nová stránka'
-  menu_actions_history:   'Historie'
-  menu_actions_history_newer: 'Novější'
-  menu_actions_history_older: 'Starší'
-  menu_actions_history_head: 'Aktuální'
-  menu_actions_view:      'Zobrazit'
-  move:                   'Přesunout'
-  move_page:              'Přesunout stránku #{page}'
-  name:                   'Jméno'
-  newer:                  'Novější'
-  new_page:               'Nová stránka'
-  no_changes:             'Žádné změny'
-  old_password:           'Staré heslo'
-  page:                   'Stránka'
-  page_edited:            'Stránka #{page} editována'
-  page_not_found:         'Pardon, stránka, kterou hledáte, nebyla nalezena.'
-  page_uploaded:          'Stránka #{page} nahrána'
-  password:               'Heslo'
-  passwords_do_not_match: 'Hesla se neshodují'
-  parents:                'Rodiče'
-  path:                   'Cesta'
-  profile_title:          'Profil uživatele #{user}'
-  really_delete:          'Opravdu smazat?'
-  reserved_path:          'Cesta je rezervována'
+  attribute_no_title:     'Disable title'
+  attribute_title:        'Title'
+  attributes:             'Attributes'
+  attributes_edited:      'Attributes of %{page} edited'
+  author:                 'Author'
+  binary_file:            'Binary file'
+  cancel:                 'Cancel'
+  change_password:        'Change password'
+  changes:                'Changes'
+  changes_of:             'Changes of %{page}'
+  changes_saved:          'Changes saved'
+  comment:                'Comment'
+  compare:                'Compare %{name}: %{from} → %{to}'
+  confirm_password:       'Confirm password'
+  create_page:            'Create %{page}'
+  create_redirect:        'Create redirect'
+  date:                   'Date'
+  delete:                 'Delete'
+  delete_page:            'Delete %{page}'
+  deleted:                'Deleted'
+  description:            'Description'
+  destination:            'Destination'
+  edit:                   'Edit'
+  edit_page:              'Editing %{page}'
+  edit_page_section:      'Editing %{page} (Section)'
+  email:                  'E-Mail'
+  empty_password:         'Empty password'
+  error_occurred:         'Oh snap! An error occurred.'
+  file:                   'File'
+  groups:                 'Groups'
+  head:                   'Head'
+  history:                'History'
+  history_of:             'History of %{page}'
+  info_binary:            '%{page} is a binary %{type} and cannot be edited like a text file.'
+  invalid_email:          'E-Mail is invalid'
+  invalid_mime_type:      'Invalid mime type'
+  invalid_name:           'Name is invalid'
+  invalid_path:           'Invalid path'
+  last_modified:          'Last modified'
+  login:                  'Login'
+  logout:                 'Logout'
+  menu_actions_edit_new:  'New Page'
+  move:                   'Move'
+  move_page:              'Move %{page}'
+  name:                   'Name'
+  new_page:               'New Page'
+  no_changes:             'No changes'
+  not_found_text:         'Sorry, the page you were looking for was not found.'
+  not_found_title:        '404 Not found'
+  old_password:           'Old password'
+  page:                   'Page'
+  page_deleted:           '%{page} deleted.'
+  page_edited:            '%{page} edited'
+  page_moved:             '%{page} moved to %{destination}.'
+  page_uploaded:          'Page %{page} uploaded'
+  parents:                'Parents'
+  password:               'Password'
+  passwords_do_not_match: 'Passwords do not match'
+  path:                   'Path'
+  powered_by:             'Powered by <a href="https://github.com/minad/olelo">&#332;lelo</a>'
+  profile_title:          'Profile of %{user}'
+  really_delete:          'Really delete?'
+  reserved_path:          'Path is reserved'
   reset:                  'Reset'
-  root:                   'Hlavní strana'
-  page_deleted:           'Stránka #{page} smazána.'
-  page_moved:             'Stránka #{page} přesunuta do #{destination}.'
-  save:                   'Uložit'
-  save_and_close:         'Uložit a zavřít'
-  search:                 'Hledat'
-  settings:               'Nastavení'
-  signup:                 'Registrovat se'
-  summary:                'Souhrn'
+  root:                   'Root'
+  save:                   'Save'
+  save_and_close:         'Save & Close'
+  search:                 'Search'
+  settings:               'Settings'
+  signup:                 'Sign up'
+  summary:                'Summary'
   text:                   'Text'
-  title:                  'Titulek'
-  tree:                   'Strom'
-  type_select:            'Vybrat hodnotu'
-  type_stringlist:        'Řetězce oddělené čárkou'
-  upload_file:            'Nahrát soubor'
-  upload:                 'Nahrát'
-  user:                   'Uživatel'
-  user_already_exists:    'Uživatel #{name} již existuje'
-  version:                'Verze'
-  version_conflict:       'Detekován konflikt verzí'
-  wrong_user_or_pw:       'Chybné jméno uživatele nebo heslo'
-  wrong_password:         'Chybné heslo'
+  title:                  'Title'
+  tree:                   'Tree'
+  type_select:            'Select value'
+  type_stringlist:        'Comma-separated strings'
+  upload:                 'Upload'
+  upload_file:            'Upload file'
+  user:                   'User'
+  user_already_exists:    'User %{name} already exists'
+  version:                'Version'
+  version_by:             'Version %{version} by %{author}, %{date}'
+  version_conflict:       'Version conflict detected'
+  wrong_password:         'Wrong password'
+  wrong_user_or_pw:       'Wrong username or password'
+fr:
+  access_denied:          "Accès refusé"
+  actions:                "Actions"
+  already_exists:         "%{page} existe déjà"
+  attribute_mime:         "Type MIME"
+  attribute_no_title:     "Désactiver le titre"
+  attribute_title:        "Titre"
+  attributes:             "Attributs"
+  attributes_edited:      "Attributs de %{page} modifiés"
+  author:                 "Auteur"
+  binary_file:            "Fichier binaire"
+  cancel:                 "Cancel"
+  change_password:        "Changer de mot de passe"
+  changes:                "Changement"
+  changes_of:             "Chamgements de %{page}"
+  changes_saved:          "Changement enregistrés"
+  comment:                "Commentaire"
+  compare:                "Comparer %{name}"
+  confirm_password:       "Confirmer le mot de passe"
+  create_page:            "Créer %{page}"
+  create_redirect:        "Créer une redirection"
+  date:                   "Date"
+  delete:                 "Effacer"
+  delete_page:            "Effacer %{page}"
+  deleted:                "Supprimé"
+  description:            "Description"
+  destination:            "Destination"
+  edit:                   "Éditer"
+  edit_page:              "Modifier %{page}"
+  edit_page_section:      "Modifier %{page} (Section)"
+  email:                  "Courriel"
+  empty_password:         "Mot de passe vide"
+  error_occurred:         "Oops ! Une erreur est survenue."
+  file:                   "Fichier"
+  groups:                 "Groupes"
+  head:                   "Tête"
+  history:                "Historique"
+  history_of:             "Historique de %{page}"
+  info_binary:            "%{page} est un binaire %{type} et ne peut pas être édité comme un fichier texte."
+  invalid_email:          "Courriel invalide"
+  invalid_mime_type:      "Type MIME invalide"
+  invalid_name:           "Nom invalide"
+  invalid_path:           "Chemin invalide"
+  last_modified:          "Dernière modification"
+  login:                  "Connexion"
+  logout:                 "Déconnexion"
+  menu_actions_edit_new:  "Nouvelle page"
+  move:                   "Déplacer"
+  move_page:              "Déplacer %{page}"
+  name:                   "Nom"
+  new_page:               "Nouvelle page"
+  newer:                  "Plus récent"
+  no_changes:             "Aucun changement"
+  not_found_text:         "Désolé, la page que vous recherchez n'a pas été trouvée."
+  not_found_title:        '404 Non trouvé'
+  old_password:           "Ancien mot de passe"
+  page:                   "Page"
+  page_deleted:           "%{page} supprimé."
+  page_edited:            "%{page} éditée"
+  page_moved:             "%{page} déplacer vers %{destination}."
+  page_uploaded:          "Page %{page} téléversé"
+  parents:                "Parents"
+  password:               "Mot de passe"
+  passwords_do_not_match: "Les mots de passe ne correspondent pas"
+  path:                   "Chemin"
+  powered_by:             'Powered by <a href="https://github.com/minad/olelo">&#332;lelo</a>'
+  profile_title:          "Profil de %{user}"
+  really_delete:          "Effacer réellement ?"
+  reserved_path:          "Chemin réservé"
+  reset:                  "Réinitialiser"
+  root:                   "Racine"
+  save:                   "Enregistrer"
+  save_and_close:         "Enregistrer et fermer"
+  search:                 "Rechercher"
+  settings:               "Paramètres"
+  signup:                 "S'enregistrer"
+  summary:                "Sommaire"
+  text:                   "Texte"
+  title:                  "Titre"
+  tree:                   "Arbre"
+  type_select:            "Sélectionnez une valeur"
+  type_stringlist:        "Chaînes séparées par des virgules"
+  upload:                 "Téléverser"
+  upload_file:            "Téléverser un fichier"
+  user:                   "Utilisateur"
+  user_already_exists:    "L'utilisateur %{name} existe déjà"
+  version:                "Version"
+  version_by:             'Version %{version} par %{author}, %{date}'
+  version_conflict:       "Conflit de version détecté"
+  wrong_password:         "Mot de passe incorect"
+  wrong_user_or_pw:       "Nom d'utilisateur ou mot de passe incorect"