Revision: f80055523376
Author: Bouke Woudstra <
boukew...@gmail.com>
Date: Wed Jan 2 10:37:39 2013
Log: Final fixes for issue 546 (translation).
http://code.google.com/p/rubyripper/source/detail?r=f80055523376
Modified:
/features/cli-preferences.feature
/lib/rubyripper/cli/cliPreferences.rb
/lib/rubyripper/gtk2/gtkPreferences.rb
/lib/rubyripper/secureRip.rb
/lib/rubyripper/system/dependency.rb
=======================================
--- /features/cli-preferences.feature Thu Dec 27 12:59:13 2012
+++ /features/cli-preferences.feature Wed Jan 2 10:37:39 2013
@@ -137,15 +137,15 @@
2) FLAC options passed: --best -V
3) Vorbis [*]
4) Oggenc options passed: -q 4
- 5) Lame mp3 [ ]
- 6) Lame options passed: -V 3 --id3v2-only
+ 5) LAME mp3 [ ]
+ 6) LAME options passed: -V 3 --id3v2-only
7) Nero AAC [ ]
8) Nero options passed: -q 0.5
- 9) Wavpack [ ]
- 10) Wavpack options passed:
+ 9) WavPack [ ]
+ 10) WavPack options passed:
11) Opus [ ]
12) Opus options passed: --bitrate 160
- 13) Wav [ ]
+ 13) WAVE [ ]
14) Other codec [ ]
15) Commandline passed: flac %i %o.flac
16) Playlist support [*]
@@ -194,15 +194,15 @@
2) FLAC options passed: --fast -V
3) Vorbis [ ]
4) Oggenc options passed: -q 5
- 5) Lame mp3 [*]
- 6) Lame options passed: -V 4
+ 5) LAME mp3 [*]
+ 6) LAME options passed: -V 4
7) Nero AAC [*]
8) Nero options passed: -q 0.6
- 9) Wavpack [*]
- 10) Wavpack options passed: -f
+ 9) WavPack [*]
+ 10) WavPack options passed: -f
11) Opus [*]
12) Opus options passed: --bitrate 200
- 13) Wav [*]
+ 13) WAVE [*]
14) Other codec [*]
15) Commandline passed: lame "%i" "%o".mp3
16) Playlist support [ ]
=======================================
--- /lib/rubyripper/cli/cliPreferences.rb Thu Dec 27 12:59:13 2012
+++ /lib/rubyripper/cli/cliPreferences.rb Wed Jan 2 10:37:39 2013
@@ -225,15 +225,15 @@
@out.puts ' 2) ' + _("FLAC options passed") + ": %s" %
[@prefs.settingsFlac]
@out.puts ' 3) ' + _("Vorbis %s") % [showBool(@prefs.vorbis)]
@out.puts ' 4) ' + _("Oggenc options passed") + ": %s" %
[@prefs.settingsVorbis]
- @out.puts ' 5) ' + _("Lame mp3 %s") % [showBool(@prefs.mp3)]
- @out.puts ' 6) ' + _("Lame options passed") + ": %s" %
[@prefs.settingsMp3]
+ @out.puts ' 5) ' + _("LAME mp3 %s") % [showBool(@prefs.mp3)]
+ @out.puts ' 6) ' + _("LAME options passed") + ": %s" %
[@prefs.settingsMp3]
@out.puts ' 7) ' + _("Nero AAC %s") % [showBool(@prefs.nero)]
@out.puts ' 8) ' + _("Nero options passed") + ": %s" %
[@prefs.settingsNero]
- @out.puts ' 9) ' + _("Wavpack %s") % [showBool(@prefs.wavpack)]
- @out.puts '10) ' + _("Wavpack options passed") + ": %s" %
[@prefs.settingsWavpack]
+ @out.puts ' 9) ' + _("WavPack %s") % [showBool(@prefs.wavpack)]
+ @out.puts '10) ' + _("WavPack options passed") + ": %s" %
[@prefs.settingsWavpack]
@out.puts '11) ' + _("Opus %s") % [showBool(@prefs.opus)]
@out.puts '12) ' + _("Opus options passed") + ": %s" %
[@prefs.settingsOpus]
- @out.puts '13) ' + _("Wav %s") % [showBool(@prefs.wav)]
+ @out.puts '13) ' + _("WAVE %s") % [showBool(@prefs.wav)]
@out.puts '14) ' + _("Other codec %s") % [showBool(@prefs.other)]
@out.puts '15) ' + _("Commandline passed") + ": %s" %
[@prefs.settingsOther]
@out.puts '16) ' + _("Playlist
support %s") %[showBool(@prefs.playlist)]
@@ -265,7 +265,7 @@
@string.get(_("Nero options passed"), @prefs.settingsNero)
when 9 then switchBool('wavpack')
when 10 then @prefs.settingsWavpack = \
- @string.get(_("Wavpack options passed"), @prefs.settingsWavpack)
+ @string.get(_("WavPack options passed"), @prefs.settingsWavpack)
when 11 then switchBool('opus')
when 12 then @prefs.settingsOpus = \
@string.get(_("Opus options passed"), @prefs.settingsOpus)
=======================================
--- /lib/rubyripper/gtk2/gtkPreferences.rb Thu Dec 27 13:09:06 2012
+++ /lib/rubyripper/gtk2/gtkPreferences.rb Wed Jan 2 10:37:39 2013
@@ -557,7 +557,7 @@
@normalize = Gtk::ComboBox.new()
@normalize.append_text(_("Don't standardize volume"))
@normalize.append_text(_("Use replaygain on audio files"))
- @normalize.append_text(_("Use normalize on wav files"))
+ @normalize.append_text(_("Use normalize on WAVE files"))
@normalize.active=0
@modus = Gtk::ComboBox.new()
@modus.append_text(_("Album / Audiophile modus"))
=======================================
--- /lib/rubyripper/secureRip.rb Thu Dec 27 12:07:31 2012
+++ /lib/rubyripper/secureRip.rb Wed Jan 2 10:37:39 2013
@@ -186,7 +186,7 @@
def fileCreated(track=nil) #check if cdparanoia outputs wav files
(passing bad parameters?)
if not File.exist?(@fileScheme.getTempFile(track, @trial))
- @log.update("error", _("Cdparanoia doesn't output wav files.\nCheck
your settings please."))
+ @log.update("error", _("Cdparanoia doesn't output WAVE files.\nCheck
your settings please."))
return false
end
return true
=======================================
--- /lib/rubyripper/system/dependency.rb Tue Dec 18 10:40:23 2012
+++ /lib/rubyripper/system/dependency.rb Wed Jan 2 10:37:39 2013
@@ -111,10 +111,10 @@
'eject' => _("Your disc tray can not be opened after ripping"),
'flac' => _("You won't be able to encode in FLAC."),
'vorbis' => _("You won't be able to encode in vorbis."),
- 'lame' => _("You won't be able to encode in lame mp3."),
- 'wavegain' => _("You won't be able to replaygain wav files."),
+ 'lame' => _("You won't be able to encode in LAME mp3."),
+ 'wavegain' => _("You won't be able to replaygain WAVE files."),
'vorbisgain' => _("You won't be able to replaygain vorbis files."),
- 'mp3gain' => _("You won't be able to replaygain Lame mp3 files."),
+ 'mp3gain' => _("You won't be able to replaygain LAME mp3 files."),
'normalize' => _("You won't be able to normalize audio files."),
'cdrdao' => _("You won't be able to make cuesheets"),
'cd-info' => _("Cd-info helps to detect data tracks."),