Index: lib/alexandria/models/library.rb

===================================================================

--- lib/alexandria/models/library.rb	(revision 1066)

+++ lib/alexandria/models/library.rb	(revision 1067)

@@ -41,7 +41,7 @@

     include GetText

     extend GetText

-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

     BOOK_ADDED, BOOK_UPDATED, BOOK_REMOVED = (0..3).to_a

     include Observable

Index: lib/alexandria/book_providers/renaud.rb

===================================================================

--- lib/alexandria/book_providers/renaud.rb	(revision 1066)

+++ lib/alexandria/book_providers/renaud.rb	(revision 1067)

@@ -24,7 +24,7 @@

   class BookProviders

     class RENAUDProvider < GenericProvider

       include GetText

-      #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       BASE_URI = "http://www.renaud-bray.com/"

       ACCENTUATED_CHARS = "áàâäçéèêëíìîïóòôöúùûü"

Index: lib/alexandria/book_providers/amazon_aws.rb

===================================================================

--- lib/alexandria/book_providers/amazon_aws.rb	(revision 1066)

+++ lib/alexandria/book_providers/amazon_aws.rb	(revision 1067)

@@ -25,7 +25,7 @@

     class AmazonProvider < GenericProvider

       include Logging

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       #CACHE_DIR = File.join(Alexandria::Library::DIR, '.amazon_cache')

Index: lib/alexandria/book_providers/mcu.rb

===================================================================

--- lib/alexandria/book_providers/mcu.rb	(revision 1066)

+++ lib/alexandria/book_providers/mcu.rb	(revision 1067)

@@ -27,7 +27,7 @@

     class MCUProvider < GenericProvider

       include Logging

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       LANGUAGES = {

         'es' => '1'

Index: lib/alexandria/book_providers/proxis.rb

===================================================================

--- lib/alexandria/book_providers/proxis.rb	(revision 1066)

+++ lib/alexandria/book_providers/proxis.rb	(revision 1067)

@@ -23,7 +23,7 @@

     class ProxisProvider < GenericProvider

       include GetText

       include Logging

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       LANGUAGES = {

         'nl' => '1',

Index: lib/alexandria/book_providers/z3950.rb

===================================================================

--- lib/alexandria/book_providers/z3950.rb	(revision 1066)

+++ lib/alexandria/book_providers/z3950.rb	(revision 1067)

@@ -26,7 +26,7 @@

     class Z3950Provider < AbstractProvider

       include Logging

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(name="Z3950", fullname="Z39.50")

         super

@@ -174,7 +174,7 @@

       unabstract

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize

         super("LOC", _("Library of Congress (Usa)"))

@@ -207,7 +207,7 @@

       unabstract

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize

         super("BL", _("British Library"))

@@ -296,7 +296,7 @@

       unabstract

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize

         super("SBN", "Servizio Bibliotecario Nazionale (Italy)")

Index: lib/alexandria/book_providers.rb

===================================================================

--- lib/alexandria/book_providers.rb	(revision 1066)

+++ lib/alexandria/book_providers.rb	(revision 1067)

@@ -25,7 +25,7 @@

     include Singleton

     include Observable

     include GetText

-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

     SEARCH_BY_ISBN, SEARCH_BY_TITLE, SEARCH_BY_AUTHORS,

     SEARCH_BY_KEYWORD = (0..3).to_a

Index: lib/alexandria/import_library.rb

===================================================================

--- lib/alexandria/import_library.rb	(revision 1066)

+++ lib/alexandria/import_library.rb	(revision 1067)

@@ -22,7 +22,7 @@

     include GetText

     extend GetText

-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

     def self.all

       [

Index: lib/alexandria/export_library.rb

===================================================================

--- lib/alexandria/export_library.rb	(revision 1066)

+++ lib/alexandria/export_library.rb	(revision 1067)

@@ -102,7 +102,7 @@

     include GetText

     include Logging

     extend GetText

-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

     def self.all

       [

Index: lib/alexandria/smart_library.rb

===================================================================

--- lib/alexandria/smart_library.rb	(revision 1066)

+++ lib/alexandria/smart_library.rb	(revision 1067)

@@ -23,7 +23,7 @@

     include Logging

     include GetText

     extend GetText

-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

     ALL_RULES, ANY_RULE = 1, 2

     attr_reader :name

@@ -290,7 +290,7 @@

     class Rule

       include GetText

       extend GetText

-      bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       attr_accessor :operand, :operation, :value

@@ -343,7 +343,7 @@

       module Operands

         include GetText

         extend GetText

-        bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+        bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

         LEFT = [

                 LeftOperand.new(:title, _("Title"), String),

@@ -375,7 +375,7 @@

         include Logging

         include GetText

         extend GetText

-        bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+        bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

         IS_TRUE = Operator.new(

                                :is_true,

Index: lib/alexandria/about.rb

===================================================================

--- lib/alexandria/about.rb	(revision 1066)

+++ lib/alexandria/about.rb	(revision 1067)

@@ -20,7 +20,7 @@

   TITLE = 'Alexandria'

   TEXTDOMAIN = 'alexandria'

   extend GetText

-  bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+  bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

   DESCRIPTION = _('A program to help you manage your book collection.')

   COPYRIGHT = "Copyright (C) 2004,2005,2006 Laurent Sansonetti\n" +

     "Copyright (C) 2007,2008,2009 Alexandria Contributors"

Index: lib/alexandria/ui/dialogs/misc_dialogs.rb

===================================================================

--- lib/alexandria/ui/dialogs/misc_dialogs.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/misc_dialogs.rb	(revision 1067)

@@ -19,7 +19,7 @@

   module UI

     class ConflictWhileCopyingDialog < AlertDialog

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, library, book)

         super(parent,

@@ -42,7 +42,7 @@

     class ReallyDeleteDialog < AlertDialog

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, library, books=nil)

         # Deleting a library.

Index: lib/alexandria/ui/dialogs/book_properties_dialog_base.rb

===================================================================

--- lib/alexandria/ui/dialogs/book_properties_dialog_base.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/book_properties_dialog_base.rb	(revision 1067)

@@ -20,7 +20,7 @@

     class BookPropertiesDialogBase < GladeBase

       include GetText

       extend GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       COVER_MAXWIDTH = 140    # pixels

Index: lib/alexandria/ui/dialogs/new_book_dialog_manual.rb

===================================================================

--- lib/alexandria/ui/dialogs/new_book_dialog_manual.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/new_book_dialog_manual.rb	(revision 1067)

@@ -20,7 +20,7 @@

     class NewBookDialogManual < BookPropertiesDialogBase

       include GetText

       extend GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       TMP_COVER_FILE = File.join(Dir.tmpdir, "tmp_cover")

       def initialize(parent, library, &on_add_cb)

Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb

===================================================================

--- lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb	(revision 1067)

@@ -20,7 +20,7 @@

     class SmartLibraryPropertiesDialogBase < Gtk::Dialog

       include Logging

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       attr_reader :predicate_operator_rule

Index: lib/alexandria/ui/dialogs/export_dialog.rb

===================================================================

--- lib/alexandria/ui/dialogs/export_dialog.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/export_dialog.rb	(revision 1067)

@@ -19,7 +19,7 @@

   module UI

     class ConfirmEraseDialog < AlertDialog

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, filename)

         super(parent, _("File already exists"),

@@ -42,7 +42,7 @@

     class ExportDialog < Gtk::FileChooserDialog

       include GetText

       extend GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       FORMATS = Alexandria::ExportFormat.all

       THEMES = Alexandria::WebTheme.all

Index: lib/alexandria/ui/dialogs/preferences_dialog.rb

===================================================================

--- lib/alexandria/ui/dialogs/preferences_dialog.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/preferences_dialog.rb	(revision 1067)

@@ -95,7 +95,7 @@

     class ProviderPreferencesDialog < ProviderPreferencesBaseDialog

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, provider)

         super(_("Preferences for %s") % provider.fullname,

@@ -120,7 +120,7 @@

     class NewProviderDialog <  ProviderPreferencesBaseDialog

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent)

         super(_("New Provider"),

@@ -209,7 +209,7 @@

     class PreferencesDialog < GladeBase

       include Alexandria::Logging

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, &changed_block)

         super('preferences_dialog.glade')

Index: lib/alexandria/ui/dialogs/new_book_dialog.rb

===================================================================

--- lib/alexandria/ui/dialogs/new_book_dialog.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/new_book_dialog.rb	(revision 1067)

@@ -26,7 +26,7 @@

   module UI

     class KeepBadISBNDialog < AlertDialog

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, book)

         super(parent, _("Invalid ISBN '%s'") % book.isbn,

@@ -51,7 +51,7 @@

       include Logging

       include GetText

       extend GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, selected_library=nil, &block)

         super('new_book_dialog.glade')

Index: lib/alexandria/ui/dialogs/new_smart_library_dialog.rb

===================================================================

--- lib/alexandria/ui/dialogs/new_smart_library_dialog.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/new_smart_library_dialog.rb	(revision 1067)

@@ -19,7 +19,7 @@

   module UI

     class NewSmartLibraryDialog < SmartLibraryPropertiesDialogBase

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, &block)

         super(parent)

Index: lib/alexandria/ui/dialogs/book_properties_dialog.rb

===================================================================

--- lib/alexandria/ui/dialogs/book_properties_dialog.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/book_properties_dialog.rb	(revision 1067)

@@ -21,7 +21,7 @@

       include Logging

       include GetText

       extend GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, library, book)

         super(parent, library.cover(book))

Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb

===================================================================

--- lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb	(revision 1067)

@@ -19,7 +19,7 @@

   module UI

     class SmartLibraryPropertiesDialog < SmartLibraryPropertiesDialogBase

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, smart_library, &block)

         super(parent)

Index: lib/alexandria/ui/dialogs/acquire_dialog.rb

===================================================================

--- lib/alexandria/ui/dialogs/acquire_dialog.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/acquire_dialog.rb	(revision 1067)

@@ -213,7 +213,7 @@

       include GetText

       include Logging

       extend GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, selected_library=nil, &block)

         super('acquire_dialog.glade')

Index: lib/alexandria/ui/dialogs/about_dialog.rb

===================================================================

--- lib/alexandria/ui/dialogs/about_dialog.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/about_dialog.rb	(revision 1067)

@@ -19,7 +19,7 @@

   module UI

     class AboutDialog < Gtk::AboutDialog

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       GPL = <

 Alexandria is free software; you can redistribute it and/or

Index: lib/alexandria/ui/dialogs/import_dialog.rb

===================================================================

--- lib/alexandria/ui/dialogs/import_dialog.rb	(revision 1066)

+++ lib/alexandria/ui/dialogs/import_dialog.rb	(revision 1067)

@@ -30,7 +30,7 @@

   module UI

     class SkipEntryDialog < AlertDialog

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       def initialize(parent, message)

         super(parent, _("Error while importing"),

@@ -53,7 +53,7 @@

       include GetText

       include Logging

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       FILTERS = Alexandria::ImportFilter.all

Index: lib/alexandria/ui/main_app.rb

===================================================================

--- lib/alexandria/ui/main_app.rb	(revision 1066)

+++ lib/alexandria/ui/main_app.rb	(revision 1067)

@@ -43,7 +43,7 @@

   module UI

     include Logging

     include GetText

-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

     class MainApp

       include Logging

Index: lib/alexandria/ui/listview.rb

===================================================================

--- lib/alexandria/ui/listview.rb	(revision 1066)

+++ lib/alexandria/ui/listview.rb	(revision 1067)

@@ -20,7 +20,7 @@

   module UI

     include Logging

     include GetText

-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

     class ListViewManager

       include Logging

       include GetText

Index: lib/alexandria/ui/ui_manager.rb

===================================================================

--- lib/alexandria/ui/ui_manager.rb	(revision 1066)

+++ lib/alexandria/ui/ui_manager.rb	(revision 1067)

@@ -24,7 +24,7 @@

         :iconview_model, :filtered_model, :on_books_selection_changed

       include Logging

       include GetText

-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

       module Columns

         COVER_LIST, COVER_ICON, TITLE, TITLE_REDUCED, AUTHORS,

Index: lib/alexandria/ui/libraries_combo.rb

===================================================================

--- lib/alexandria/ui/libraries_combo.rb	(revision 1066)

+++ lib/alexandria/ui/libraries_combo.rb	(revision 1067)

@@ -19,7 +19,7 @@

 class Gtk::ComboBox

   include GetText

   extend GetText

-  GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")

+  GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")

   def populate_with_libraries(libraries, selected_library)

     libraries_names = libraries.map { |x| x.name }