gettext 1.8.0 → 1.9.0

data/lib/gettext/utils.rb

@@ -1,7 +1,7 @@
 =begin
   utils.rb - Utility functions
 
-  Copyright (C) 2005 Masao Mutoh
+  Copyright (C) 2005,2006 Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -36,8 +36,7 @@ module GetText
   # * Returns: self 
   def msgmerge(defpo, refpo, app_version) 
     $stderr.puts defpo
-    cmd = ENV["MSGMERGE_PATH"]
-    cmd ||= "msgmerge"
+    cmd = ENV["MSGMERGE_PATH"] || "msgmerge"
 
     cont = ""
     if FileTest.exist? defpo
@@ -47,9 +46,16 @@ module GetText
 	cont = io.read
       end
     end
-    cont.sub!(/(Project-Id-Version\:).*$/, "\\1 #{app_version}\\n\"")
-    File.open(defpo, "w") do |out| 
-      out.write(cont)
+    if cont.empty?
+      failed_filename = refpo + "~"
+      FileUtils.cp(refpo, failed_filename)
+      $stderr.puts _("Failed to merge with %{defpo} - skipping!") % {:defpo => defpo}
+      $stderr.puts _("Please check new .pot in %{failed_filename}") %{:failed_filename => failed_filename}
+    else
+      cont.sub!(/(Project-Id-Version\:).*$/, "\\1 #{app_version}\\n\"")
+      File.open(defpo, "w") do |out|
+        out.write(cont)
+      end
     end
     self
   end

data/lib/gettext/version.rb

@@ -2,11 +2,11 @@
 =begin
   version - version information of Ruby-GetText-Package
 
-  Copyright (C) 2005,2006 Masao Mutoh
+  Copyright (C) 2005-2007 Masao Mutoh
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
 module GetText
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

data/po/ca/rails.po

@@ -0,0 +1,121 @@
+#
+# a po-file for Ruby-GetText-Package and Ruby on Rails.
+#
+# Copyright (C) 2005,2006 Masao Mutoh
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Ramon Salvadó <rsalvado at gnuine.com>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ruby-gettext 1.9.0\n"
+"POT-Creation-Date: 2006-12-20 00:05+0900\n"
+"PO-Revision-Date: 2005-12-17 14:33+0900\n"
+"Last-Translator: Ramon Salvadó <rsalvado at gnuine.com>\n"
+"Language-Team: Catalan\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: lib/gettext/rails.rb:278
+msgid "%{num} error prohibited this %{record} from being saved"
+msgid_plural "%{num} errors prohibited this %{record} from being saved"
+msgstr[0] "%{num} error impedeix que es pugui guardar %{record}"
+msgstr[1] "%{num} errors impedeixen que es pugui guardar %{record}"
+
+#: lib/gettext/rails.rb:280
+msgid "There was a problem with the following field:"
+msgid_plural "There were problems with the following fields:"
+msgstr[0] "Hi ha problemes amb el següent camp:"
+msgstr[1] "Hi ha problemes amb els següents camps:"
+
+#: lib/gettext/rails.rb:367
+msgid "less than 5 seconds"
+msgstr "menys de 5 segons"
+
+#: lib/gettext/rails.rb:367
+msgid "less than 10 seconds"
+msgstr "menys de 10 segons"
+
+#: lib/gettext/rails.rb:367
+msgid "less than 20 seconds"
+msgstr "menys de 20 segons"
+
+#: lib/gettext/rails.rb:368
+msgid "half a minute"
+msgstr "mig minut"
+
+#: lib/gettext/rails.rb:368
+msgid "less than a minute"
+msgstr "menys d'un minut"
+
+#: lib/gettext/rails.rb:369
+msgid "1 minute"
+msgid_plural "%{num} minutes"
+msgstr[0] "1 minut"
+msgstr[1] "%{num} minuts"
+
+#: lib/gettext/rails.rb:370
+msgid "about 1 hour"
+msgid_plural "about %{num} hours"
+msgstr[0] "al voltant d'1 hora"
+msgstr[1] "al voltant de %{num} hores"
+
+#: lib/gettext/rails.rb:371
+msgid "1 day"
+msgid_plural "%{num} days"
+msgstr[0] "1 dia"
+msgstr[1] "%{num} dies"
+
+#: lib/gettext/active_record.rb:27
+msgid "Validation failed: %{error_messages}"
+msgstr "La validació ha fallat: %{error_messages}"
+
+#: lib/gettext/active_record.rb:195
+msgid "%{fn} is not included in the list"
+msgstr "%{fn} no pertany a la llista de possibles valors"
+
+#: lib/gettext/active_record.rb:196
+msgid "%{fn} is reserved"
+msgstr "%{fn} no està permès"
+
+#: lib/gettext/active_record.rb:197
+msgid "%{fn} is invalid"
+msgstr "%{fn} no és vàlid"
+
+#: lib/gettext/active_record.rb:198
+msgid "%{fn} doesn't match confirmation"
+msgstr "%{fn} no té el mateix valor que la confirmació"
+
+#: lib/gettext/active_record.rb:199
+msgid "%{fn} must be accepted"
+msgstr "%{fn} ha de ser acceptat"
+
+#: lib/gettext/active_record.rb:200
+msgid "%{fn} can't be empty"
+msgstr "%{fn} no pot ser buit"
+
+#: lib/gettext/active_record.rb:201
+msgid "%{fn} can't be blank"
+msgstr "%{fn} no pot estar en blanc"
+
+#: lib/gettext/active_record.rb:202
+msgid "%{fn} is too long (maximum is %d characters)"
+msgstr "%{fn} és massa llarg (màxim de %d caràcters)"
+
+#: lib/gettext/active_record.rb:203
+msgid "%{fn} is too short (minimum is %d characters)"
+msgstr "%{fn} és massa curt (mínim de %d caràcters)"
+
+#: lib/gettext/active_record.rb:204
+msgid "%{fn} is the wrong length (should be %d characters)"
+msgstr "%{fn} té una llargària incorrecta (hauria de tenir %d caràcters)"
+
+#: lib/gettext/active_record.rb:205
+msgid "%{fn} has already been taken"
+msgstr "%{fn} ja existent"
+
+#: lib/gettext/active_record.rb:206
+msgid "%{fn} is not a number"
+msgstr "%{fn} no és un número"

data/po/ca/rgettext.po

@@ -0,0 +1,130 @@
+#
+# po-file for Ruby-GetText-Package
+#
+# Copyright (C) 2004-2006 Masao Mutoh
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Ramon Salvadó <rsalvado at gnuine.com>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ruby-gettext 1.9.0\n"
+"POT-Creation-Date: 2006-12-20 00:05+0900\n"
+"PO-Revision-Date: 2005-12-20 10:33+0900E\n"
+"Last-Translator: Ramon Salvadó <rsalvado at gnuine.com>\n"
+"Language-Team: Catalan\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: lib/gettext/utils.rb:52
+msgid "Failed to merge with %{defpo} - skipping!"
+msgstr "Ha fallat al fer el merge amb %{defpo} - saltant!"
+
+#: lib/gettext/utils.rb:53
+msgid "Please check new .pot in %{failed_filename}"
+msgstr "Si us plau comprova el nou .pot a %{failed_filename}"
+
+#: lib/gettext/rmsgfmt.rb:31 lib/gettext/rgettext.rb:196
+msgid "no input files"
+msgstr "no hi ha fitxers d'entrada"
+
+#: lib/gettext/rmsgfmt.rb:47
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Ús: %s entrada.po [-o sortida.mo]"
+
+#: lib/gettext/rmsgfmt.rb:49
+msgid "Generate binary message catalog from textual translation description."
+msgstr ""
+"Genera un catàleg de missatges binaris a partir d'un fitxer de traducció "
+"textual."
+
+#: lib/gettext/rmsgfmt.rb:51 lib/gettext/rmsgmerge.rb:408
+#: lib/gettext/rgettext.rb:153
+msgid "Specific options:"
+msgstr "Opcions específiques:"
+
+#: lib/gettext/rmsgfmt.rb:53 lib/gettext/rmsgmerge.rb:410
+#: lib/gettext/rgettext.rb:155
+msgid "write output to specified file"
+msgstr "escriu la sortida en un fitxer especificat"
+
+#: lib/gettext/rmsgfmt.rb:57 lib/gettext/rmsgmerge.rb:421
+#: lib/gettext/rgettext.rb:172
+msgid "display version information and exit"
+msgstr "mostra informació de la versió i surt"
+
+#: lib/gettext/rmsgmerge.rb:403
+msgid "Usage: %s def.po ref.pot [-o output.pot]"
+msgstr "Ús: %s def.po ref.pot [-o sortida.pot]"
+
+#: lib/gettext/rmsgmerge.rb:406
+msgid ""
+"Merges two Uniforum style .po files together. The def.po file is an existing "
+"PO file with translations. The ref.pot file is the last created PO file with "
+"up-to-date source references. ref.pot is generally created by rgettext."
+msgstr ""
+"Combina dos fitxers .po d'estil Uniforum. El fitxer def.po és un fitxer PO "
+"existent amb traduccions. El fitxer ref.pot és l'últim fitxer PO amb "
+"referències actualitzades. Normalment qui ha creat ref.pot és rgettext"
+
+#: lib/gettext/rmsgmerge.rb:447
+msgid "definition po is not given."
+msgstr "no s'ha donat una definició po"
+
+#: lib/gettext/rmsgmerge.rb:449
+msgid "reference pot is not given."
+msgstr "no s'ha donat una referència pot"
+
+#: lib/gettext/rgettext.rb:43
+msgid "'%{klass}' is ignored."
+msgstr "'%{klass}' ignorat"
+
+#: lib/gettext/rgettext.rb:149
+msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
+msgstr "Ús: %s entrada.po [-r parser.rb] [-o sortida.pot]"
+
+#: lib/gettext/rgettext.rb:151
+msgid "Extract translatable strings from given input files."
+msgstr "Extreu les cadenes de paraules traduïbles dels fitxers d'entrada."
+
+#: lib/gettext/rgettext.rb:159
+msgid "File '%s' already exists."
+msgstr "El fitxer '%s' ja existeix"
+
+#: lib/gettext/rgettext.rb:164
+msgid "require the library before executing rgettext"
+msgstr "requereix la llibreia abans d'executar rgettext"
+
+#: lib/gettext/rgettext.rb:168
+msgid "run in debugging mode"
+msgstr "executa en mode debug"
+
+#: lib/gettext/parser/glade.rb:74
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "El fitxer `%{file}' no té el format glade-2.0."
+
+#: lib/gettext/parser/active_record.rb:39
+msgid "'%{file}' is not found."
+msgstr "El fitxer '%{file}' no s'ha trobat"
+
+#: lib/gettext/parser/active_record.rb:80
+msgid "Ignored '%{file}'. Solve dependencies first."
+msgstr "S'ignora el fitxer '%{file}'. Primer ha de resoldre les dependències."
+
+#: lib/gettext/parser/active_record.rb:104
+msgid "No database is available."
+msgstr "No hi ha una base de dades disponible."
+
+#: lib/gettext/parser/active_record.rb:137
+msgid "rubygems are not found."
+msgstr "no s'ha trobat rubygems"
+
+#: src/poparser.ry:26 src/poparser.ry:41
+msgid "Warning: fuzzy message was ignored.\n"
+msgstr "Avís: s'ha ignorat el missatge ambigu.\n"
+
+#: src/poparser.ry:125
+msgid "Warning: obsolete msgid exists.\n"
+msgstr "Avís: existeix un msgid obsolet.\n"

data/po/cs/rails.po

@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.8.0\n"
-"POT-Creation-Date: 2006-08-23 00:28+0900\n"
-"PO-Revision-Date: 2006-07-10 10:08+0100\n"
-"Last-Translator: Karel Miarka <kajism at yahoo.com>\n"
+"Project-Id-Version: ruby-gettext 1.9.0\n"
+"POT-Creation-Date: 2006-12-20 00:05+0900\n"
+"PO-Revision-Date: 2006-12-16 13:08+0100\n"
+"Last-Translator: Karel Miarka <kajism@yahoo.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,105 +20,109 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Czech\n"
 
-#: lib/gettext/rails.rb:271
+#: lib/gettext/rails.rb:278
 msgid "%{num} error prohibited this %{record} from being saved"
 msgid_plural "%{num} errors prohibited this %{record} from being saved"
 msgstr[0] "%{num} chyba znemožnila uložení záznamu %{record} "
 msgstr[1] "%{num} chyby znemožnily uložení záznamu %{record} "
 msgstr[2] "%{num} chyb znemožnilo uložení záznamu %{record} "
 
-#: lib/gettext/rails.rb:273
+#: lib/gettext/rails.rb:280
 msgid "There was a problem with the following field:"
 msgid_plural "There were problems with the following fields:"
 msgstr[0] "Problémy jsou s následujícím polem:"
 msgstr[1] "Problémy jsou s následujícími poli:"
 msgstr[2] "Problémy jsou s následujícími poli:"
 
-#: lib/gettext/rails.rb:360
+#: lib/gettext/rails.rb:367
 msgid "less than 5 seconds"
 msgstr "méně než 5 sekund"
 
-#: lib/gettext/rails.rb:360
+#: lib/gettext/rails.rb:367
 msgid "less than 10 seconds"
 msgstr "méně než 10 sekund"
 
-#: lib/gettext/rails.rb:360
+#: lib/gettext/rails.rb:367
 msgid "less than 20 seconds"
 msgstr "méně než 20 sekund"
 
-#: lib/gettext/rails.rb:361
+#: lib/gettext/rails.rb:368
 msgid "half a minute"
 msgstr "půl minuty"
 
-#: lib/gettext/rails.rb:361
+#: lib/gettext/rails.rb:368
 msgid "less than a minute"
 msgstr "méně než minutu"
 
-#: lib/gettext/rails.rb:362
+#: lib/gettext/rails.rb:369
 msgid "1 minute"
 msgid_plural "%{num} minutes"
 msgstr[0] "1 minuta"
 msgstr[1] "%{num} minuty"
 msgstr[2] "%{num} minut"
 
-#: lib/gettext/rails.rb:363
+#: lib/gettext/rails.rb:370
 msgid "about 1 hour"
 msgid_plural "about %{num} hours"
 msgstr[0] "asi 1 hodina"
 msgstr[1] "asi %{num} hodiny"
 msgstr[2] "asi %{num} hodin"
 
-#: lib/gettext/rails.rb:364
+#: lib/gettext/rails.rb:371
 msgid "1 day"
 msgid_plural "%{num} days"
 msgstr[0] "1 den"
 msgstr[1] "%{num} dny"
 msgstr[2] "%{num} dnů"
 
-#: lib/gettext/active_record.rb:166
+#: lib/gettext/active_record.rb:27
+msgid "Validation failed: %{error_messages}"
+msgstr "Výsledek validace: %{error_messages}"
+
+#: lib/gettext/active_record.rb:195
 msgid "%{fn} is not included in the list"
 msgstr "%{fn} není obsaženo v seznamu možností"
 
-#: lib/gettext/active_record.rb:167
+#: lib/gettext/active_record.rb:196
 msgid "%{fn} is reserved"
 msgstr "%{fn} je rezervováno a nemůže být zvoleno"
 
-#: lib/gettext/active_record.rb:168
+#: lib/gettext/active_record.rb:197
 msgid "%{fn} is invalid"
 msgstr "%{fn} je chybné"
 
-#: lib/gettext/active_record.rb:169
+#: lib/gettext/active_record.rb:198
 msgid "%{fn} doesn't match confirmation"
 msgstr "%{fn} není shodné s potvrzením"
 
-#: lib/gettext/active_record.rb:170
+#: lib/gettext/active_record.rb:199
 msgid "%{fn} must be accepted"
 msgstr "%{fn} musí být zaškrtnuto"
 
-#: lib/gettext/active_record.rb:171
+#: lib/gettext/active_record.rb:200
 msgid "%{fn} can't be empty"
 msgstr "%{fn} musí být vyplněno"
 
-#: lib/gettext/active_record.rb:172
+#: lib/gettext/active_record.rb:201
 msgid "%{fn} can't be blank"
 msgstr "%{fn} musí být vyplněno"
 
-#: lib/gettext/active_record.rb:173
+#: lib/gettext/active_record.rb:202
 msgid "%{fn} is too long (maximum is %d characters)"
 msgstr "%{fn} je příliš dlouhé (maximum je %d znaků)"
 
-#: lib/gettext/active_record.rb:174
+#: lib/gettext/active_record.rb:203
 msgid "%{fn} is too short (minimum is %d characters)"
 msgstr "%{fn} je příliš krátké (minimum je %d znaků)"
 
-#: lib/gettext/active_record.rb:175
+#: lib/gettext/active_record.rb:204
 msgid "%{fn} is the wrong length (should be %d characters)"
 msgstr "%{fn} má nesprávnou délku (musí mít %d znaků)"
 
-#: lib/gettext/active_record.rb:176
+#: lib/gettext/active_record.rb:205
 msgid "%{fn} has already been taken"
 msgstr "%{fn} je již použito"
 
-#: lib/gettext/active_record.rb:177
+#: lib/gettext/active_record.rb:206
 msgid "%{fn} is not a number"
 msgstr "%{fn} není správné číslo"