Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2011-06-28 00:49:44 +02:00
6 changed files with 10 additions and 6 deletions

View File

@@ -1186,6 +1186,7 @@
'min delay' => 'Minimum delay',
'min size' => 'Min object size (KB):',
'minimal' => 'Minimal',
'minute' => 'Minute',
'minutes' => 'Minutes',
'misc-options' => 'Miscellaneous options',
'missing dat' => 'Encrypted archive not found',