experteer-gettext 2.0.4.1 → 2.0.4.2

data/lib/gettext/textdomain_manager.rb

@@ -194,7 +194,7 @@ module GetText
       @@singular_message_cache = {}
       @@plural_message_cache = {}
     end
-
+    
     def create_or_find_textdomain_group(klass) #:nodoc:
       group = @@textdomain_group_pool[klass]
       return group if group

data/lib/gettext/tools/rgettext.rb

@@ -96,17 +96,10 @@ TITLE
 
     def generate_pot(ary) # :nodoc:
       str = ""
-      ary.each do |target|
-        # extracted comments
-        if target.extracted_comment
-          target.extracted_comment.split("\n").each do |comment_line|
-            str << "\n#. #{comment_line.strip}"
-          end
-        end
-
-        # references
+      ary.each do |key|
+        msgid = key.shift
         curr_pos = MAX_LINE_LEN
-        target.occurrences.each do |e|
+        key.each do |e|
           if curr_pos + e.size > MAX_LINE_LEN
             str << "\n#:"
             curr_pos = 3
@@ -115,21 +108,63 @@ TITLE
           end
           str << " " << e
         end
-
-        # msgctxt, msgid, msgstr
-        str << "\nmsgctxt \"" << target.msgctxt << "\"" if target.msgctxt
-        str << "\nmsgid \"" << target.escaped(:msgid) << "\"\n"
-        if target.plural
-          str << "msgid_plural \"" << target.escaped(:plural) << "\"\n"
+        msgid.gsub!(/"/, '\"')
+        msgid.gsub!(/\r/, '')
+        if msgid.include?("\004")
+          msgctxt, msgid = msgid.split(/\004/)
+          str << "\nmsgctxt \"" << msgctxt << "\"\n"
+        else
+          str << "\n"
+        end
+        if msgid.include?("\000")
+          ids = msgid.split(/\000/)
+          str << "msgid \"" << ids[0] << "\"\n"
+          str << "msgid_plural \"" << ids[1] << "\"\n"
           str << "msgstr[0] \"\"\n"
           str << "msgstr[1] \"\"\n"
         else
+          str << "msgid \"" << msgid << "\"\n"
           str << "msgstr \"\"\n"
         end
       end
       str
     end
 
+    def normalize(ary)  # :nodoc:
+      used_plural_msgs = []
+      ary.select{|item| item[0].include? "\000"}.each do |plural_msg|
+        next if used_plural_msgs.include?(plural_msg[0])
+
+        key = plural_msg[0].split("\000")[0]
+
+        ary.dup.each do |single_msg|
+          if single_msg[0] == key or
+              (single_msg[0] =~ /^#{Regexp.quote(key)}\000/ and 
+               single_msg[0] != plural_msg[0])
+            if single_msg[0] != key 
+              warn %Q[Warning: n_("#{plural_msg[0].gsub(/\000/, '", "')}") and n_("#{single_msg[0].gsub(/\000/, '", "')}") are duplicated. First msgid was used.] 
+              used_plural_msgs << single_msg[0]
+            end
+
+            single_msg[1..-1].each do |line_info|
+              plural_msg << line_info
+              fname = line_info.split(/:/)[0]
+              sorted = plural_msg[1..-1].select{|l| l.split(/:/)[0].include?(fname)}.collect{|l| 
+                aline = l.split(/:/)
+                [aline[0], aline[1] =~ /[0-9]+/ ? aline[1].to_i : aline[1]]
+              }.sort.collect{|l| "#{l[0]}:#{l[1]}"}
+              plural_msg.delete_if{|i| sorted.include?(i)}
+              sorted.each {|i|
+                plural_msg << i
+              }
+            end
+            ary.delete(single_msg)
+          end
+        end
+      end
+      ary.collect{|i| i.uniq}
+    end
+
     def parse(files) # :nodoc:
       ary = []
       files.each do |file|
@@ -141,11 +176,11 @@ TITLE
             end
           end
         rescue
-          puts "Error parsing " + file
+          puts "Error occurs in " + file
           raise
         end
       end
-      ary
+      normalize(ary)
     end
 
     def check_options # :nodoc:

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 module GetText
   VERSION = "2.0.4"
-  EXPERTEER_SUB_VERSION="1"
+  EXPERTEER_SUB_VERSION="2"
 end

data/po/bg/rgettext.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 2.0.4\n"
-"POT-Creation-Date: 2009-09-08 08:25+0200\n"
+"Project-Id-Version: ruby-gettext 2.0.3\n"
+"POT-Creation-Date: 2009-05-17 23:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sava Chankov <sava.chankov@gmail.com>\n"
 "Language-Team: Bulgarian <ruby-on-rails-bulgaria@googlegroups.com>\n"
@@ -18,65 +18,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/gettext/textdomain_manager.rb:148
-msgid "3rd parmeter is wrong: value = %{number}"
-msgstr "Третият параметър е грешен: value = %{number}"
-
-#: lib/gettext/parser/glade.rb:75
-msgid "`%{file}' is not glade-2.0 format."
-msgstr "`%{file}' не е във формат glade-2.0."
-
-#: lib/gettext/tools/rmsgfmt.rb:29 lib/gettext/tools/rgettext.rb:202
-msgid "no input files"
-msgstr "няма зададени файлове"
-
-#: lib/gettext/tools/rmsgfmt.rb:46
-msgid "Usage: %s input.po [-o output.mo]"
-msgstr "Употреба: %s input.po [-o output.mo]"
+#: lib/gettext/tools.rb:68
+msgid "Failed to merge with %{defpo}"
+msgstr "Пропадна сливането с %{defpo}"
 
-#: lib/gettext/tools/rmsgfmt.rb:48
-msgid "Generate binary message catalog from textual translation description."
-msgstr "Генериране на двоични файлове с преводите от текстовите описания."
+#: lib/gettext/tools.rb:69
+msgid "New .pot was copied to %{failed_filename}"
+msgstr "Новия .pot беше копиран като %{failed_filename}"
 
-#: lib/gettext/tools/rmsgfmt.rb:50 lib/gettext/tools/rgettext.rb:159
-#: lib/gettext/tools/rmsgmerge.rb:407
-msgid "Specific options:"
-msgstr "Специфични опции:"
+#: lib/gettext/tools.rb:70
+msgid "Check these po/pot-files. It may have syntax errors or something wrong."
+msgstr ""
+"Проверете тези po/pot файлове. Може да имат синтактични грешки или нещо "
+"друго."
 
-#: lib/gettext/tools/rmsgfmt.rb:52 lib/gettext/tools/rgettext.rb:161
-#: lib/gettext/tools/rmsgmerge.rb:409
-msgid "write output to specified file"
-msgstr "изходът беше записан в зададения файл"
+#: lib/gettext/tools.rb:173
+msgid ""
+"`%{cmd}' can not be found. \n"
+"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+msgstr ""
 
-#: lib/gettext/tools/rmsgfmt.rb:56 lib/gettext/tools/rgettext.rb:178
-#: lib/gettext/tools/rmsgmerge.rb:420
-msgid "display version information and exit"
-msgstr "показване на версията и изход"
+#: lib/gettext/textdomain_manager.rb:147
+msgid "3rd parmeter is wrong: value = %{number}"
+msgstr "Третият параметър е грешен: value = %{number}"
 
 #: lib/gettext/tools/rgettext.rb:43
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}' беше игнориран."
 
-#: lib/gettext/tools/rgettext.rb:155
+#: lib/gettext/tools/rgettext.rb:190
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "Употреба: %s input.rb [-r parser.rb] [-o output.pot] "
 
-#: lib/gettext/tools/rgettext.rb:157
+#: lib/gettext/tools/rgettext.rb:192
 msgid "Extract translatable strings from given input files."
 msgstr "Извличане на преводните низове от зададените файлове."
 
-#: lib/gettext/tools/rgettext.rb:165
+#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgfmt.rb:50
+#: lib/gettext/tools/rmsgmerge.rb:407
+msgid "Specific options:"
+msgstr "Специфични опции:"
+
+#: lib/gettext/tools/rgettext.rb:196 lib/gettext/tools/rmsgfmt.rb:52
+#: lib/gettext/tools/rmsgmerge.rb:409
+msgid "write output to specified file"
+msgstr "изходът беше записан в зададения файл"
+
+#: lib/gettext/tools/rgettext.rb:200
 msgid "File '%s' already exists."
 msgstr "Файлът '%s' съществува."
 
-#: lib/gettext/tools/rgettext.rb:170
+#: lib/gettext/tools/rgettext.rb:205
 msgid "require the library before executing rgettext"
 msgstr "заредете библиотеката с require преди да изпълните rgettext"
 
-#: lib/gettext/tools/rgettext.rb:174
+#: lib/gettext/tools/rgettext.rb:209
 msgid "run in debugging mode"
 msgstr "изпълнение в режим на дебъгване"
 
+#: lib/gettext/tools/rgettext.rb:213 lib/gettext/tools/rmsgfmt.rb:56
+#: lib/gettext/tools/rmsgmerge.rb:420
+msgid "display version information and exit"
+msgstr "показване на версията и изход"
+
+#: lib/gettext/tools/rgettext.rb:237 lib/gettext/tools/rmsgfmt.rb:29
+msgid "no input files"
+msgstr "няма зададени файлове"
+
+#: lib/gettext/tools/rmsgfmt.rb:46
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Употреба: %s input.po [-o output.mo]"
+
+#: lib/gettext/tools/rmsgfmt.rb:48
+msgid "Generate binary message catalog from textual translation description."
+msgstr "Генериране на двоични файлове с преводите от текстовите описания."
+
 #: lib/gettext/tools/rmsgmerge.rb:402
 msgid "Usage: %s def.po ref.pot [-o output.pot]"
 msgstr "Употреба: %s def.po ref.pot [-o output.pot]"
@@ -99,25 +115,9 @@ msgstr "съществуващия po не е зададен."
 msgid "reference pot is not given."
 msgstr "pot с референциите не е зададен."
 
-#: lib/gettext/tools.rb:68
-msgid "Failed to merge with %{defpo}"
-msgstr "Пропадна сливането с %{defpo}"
-
-#: lib/gettext/tools.rb:69
-msgid "New .pot was copied to %{failed_filename}"
-msgstr "Новия .pot беше копиран като %{failed_filename}"
-
-#: lib/gettext/tools.rb:70
-msgid "Check these po/pot-files. It may have syntax errors or something wrong."
-msgstr ""
-"Проверете тези po/pot файлове. Може да имат синтактични грешки или нещо "
-"друго."
-
-#: lib/gettext/tools.rb:173
-msgid ""
-"`%{cmd}' can not be found. \n"
-"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
-msgstr ""
+#: lib/gettext/parser/glade.rb:75
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "`%{file}' не е във формат glade-2.0."
 
 #: src/poparser.ry:38 src/poparser.ry:55
 msgid "Warning: fuzzy message was ignored.\n"

data/po/bs/rgettext.po

@@ -8,8 +8,8 @@
 # Sanjin Sehic <saserr@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 2.0.4\n"
-"POT-Creation-Date: 2009-09-08 08:25+0200\n"
+"Project-Id-Version: ruby-gettext 2.0.3\n"
+"POT-Creation-Date: 2009-05-17 23:09+0900\n"
 "PO-Revision-Date: 2007-03-17 16:19+0100\n"
 "Last-Translator: Sanjin Sehic <saserr@gmail.com>\n"
 "Language-Team: Bosnian <saserr@gmail.com>\n"
@@ -20,65 +20,81 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/gettext/textdomain_manager.rb:148
-msgid "3rd parmeter is wrong: value = %{number}"
-msgstr ""
-
-#: lib/gettext/parser/glade.rb:75
-msgid "`%{file}' is not glade-2.0 format."
-msgstr "'%{file}' nije glade-2.0 format."
-
-#: lib/gettext/tools/rmsgfmt.rb:29 lib/gettext/tools/rgettext.rb:202
-msgid "no input files"
-msgstr "nema ulaznih datoteka"
-
-#: lib/gettext/tools/rmsgfmt.rb:46
-msgid "Usage: %s input.po [-o output.mo]"
-msgstr "Korištenje: %s ulaz.po [-o izlaz.mo]"
+#: lib/gettext/tools.rb:68
+#, fuzzy
+msgid "Failed to merge with %{defpo}"
+msgstr "Spajanje sa %{defpo} nije uspjelo - nastavljam dalje!"
 
-#: lib/gettext/tools/rmsgfmt.rb:48
-msgid "Generate binary message catalog from textual translation description."
-msgstr "Generiši binarni katalog poruka iz tekstualnog opisa prevoda"
+#: lib/gettext/tools.rb:69
+#, fuzzy
+msgid "New .pot was copied to %{failed_filename}"
+msgstr "Molim da provjerite novi .pot u %{failed_filename}"
 
-#: lib/gettext/tools/rmsgfmt.rb:50 lib/gettext/tools/rgettext.rb:159
-#: lib/gettext/tools/rmsgmerge.rb:407
-msgid "Specific options:"
-msgstr "Specifične opcije:"
+#: lib/gettext/tools.rb:70
+msgid "Check these po/pot-files. It may have syntax errors or something wrong."
+msgstr ""
 
-#: lib/gettext/tools/rmsgfmt.rb:52 lib/gettext/tools/rgettext.rb:161
-#: lib/gettext/tools/rmsgmerge.rb:409
-msgid "write output to specified file"
-msgstr "zapiši izlaz u specifičnu datoteku"
+#: lib/gettext/tools.rb:173
+msgid ""
+"`%{cmd}' can not be found. \n"
+"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+msgstr ""
 
-#: lib/gettext/tools/rmsgfmt.rb:56 lib/gettext/tools/rgettext.rb:178
-#: lib/gettext/tools/rmsgmerge.rb:420
-msgid "display version information and exit"
-msgstr "prikaži informaciju o verziji i završi"
+#: lib/gettext/textdomain_manager.rb:147
+msgid "3rd parmeter is wrong: value = %{number}"
+msgstr ""
 
 #: lib/gettext/tools/rgettext.rb:43
 msgid "'%{klass}' is ignored."
 msgstr "%{klass} je ignorisan."
 
-#: lib/gettext/tools/rgettext.rb:155
+#: lib/gettext/tools/rgettext.rb:190
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "Korištenje: %s ulaz.rb [-r parser.rb] [-o izlaz.pot]"
 
-#: lib/gettext/tools/rgettext.rb:157
+#: lib/gettext/tools/rgettext.rb:192
 msgid "Extract translatable strings from given input files."
 msgstr "Izvadi niske za prevođenje iz date ulazne datoteke."
 
-#: lib/gettext/tools/rgettext.rb:165
+#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgfmt.rb:50
+#: lib/gettext/tools/rmsgmerge.rb:407
+msgid "Specific options:"
+msgstr "Specifične opcije:"
+
+#: lib/gettext/tools/rgettext.rb:196 lib/gettext/tools/rmsgfmt.rb:52
+#: lib/gettext/tools/rmsgmerge.rb:409
+msgid "write output to specified file"
+msgstr "zapiši izlaz u specifičnu datoteku"
+
+#: lib/gettext/tools/rgettext.rb:200
 msgid "File '%s' already exists."
 msgstr "Datoteka '%s' već postoji."
 
-#: lib/gettext/tools/rgettext.rb:170
+#: lib/gettext/tools/rgettext.rb:205
 msgid "require the library before executing rgettext"
 msgstr "zahtjevaj biblioteku prije izvršavanja rgettext-a"
 
-#: lib/gettext/tools/rgettext.rb:174
+#: lib/gettext/tools/rgettext.rb:209
 msgid "run in debugging mode"
 msgstr "pokreni u modu za nalaženje grešaka"
 
+#: lib/gettext/tools/rgettext.rb:213 lib/gettext/tools/rmsgfmt.rb:56
+#: lib/gettext/tools/rmsgmerge.rb:420
+msgid "display version information and exit"
+msgstr "prikaži informaciju o verziji i završi"
+
+#: lib/gettext/tools/rgettext.rb:237 lib/gettext/tools/rmsgfmt.rb:29
+msgid "no input files"
+msgstr "nema ulaznih datoteka"
+
+#: lib/gettext/tools/rmsgfmt.rb:46
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Korištenje: %s ulaz.po [-o izlaz.mo]"
+
+#: lib/gettext/tools/rmsgfmt.rb:48
+msgid "Generate binary message catalog from textual translation description."
+msgstr "Generiši binarni katalog poruka iz tekstualnog opisa prevoda"
+
 #: lib/gettext/tools/rmsgmerge.rb:402
 msgid "Usage: %s def.po ref.pot [-o output.pot]"
 msgstr "Korištenje: %s def.po ref.pot [-o izlaz.pot]"
@@ -102,25 +118,9 @@ msgstr "definicijski po nije dat."
 msgid "reference pot is not given."
 msgstr "referencni po nije dat."
 
-#: lib/gettext/tools.rb:68
-#, fuzzy
-msgid "Failed to merge with %{defpo}"
-msgstr "Spajanje sa %{defpo} nije uspjelo - nastavljam dalje!"
-
-#: lib/gettext/tools.rb:69
-#, fuzzy
-msgid "New .pot was copied to %{failed_filename}"
-msgstr "Molim da provjerite novi .pot u %{failed_filename}"
-
-#: lib/gettext/tools.rb:70
-msgid "Check these po/pot-files. It may have syntax errors or something wrong."
-msgstr ""
-
-#: lib/gettext/tools.rb:173
-msgid ""
-"`%{cmd}' can not be found. \n"
-"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
-msgstr ""
+#: lib/gettext/parser/glade.rb:75
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "'%{file}' nije glade-2.0 format."
 
 #: src/poparser.ry:38 src/poparser.ry:55
 msgid "Warning: fuzzy message was ignored.\n"

data/po/ca/rgettext.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 2.0.4\n"
-"POT-Creation-Date: 2009-09-08 08:25+0200\n"
+"Project-Id-Version: ruby-gettext 2.0.3\n"
+"POT-Creation-Date: 2009-05-17 23:09+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"
@@ -18,67 +18,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/gettext/textdomain_manager.rb:148
-msgid "3rd parmeter is wrong: value = %{number}"
-msgstr "El tercer paràmetre es erroni: valor = %{number}"
-
-#: lib/gettext/parser/glade.rb:75
-msgid "`%{file}' is not glade-2.0 format."
-msgstr "El fitxer `%{file}' no té el format glade-2.0."
-
-#: lib/gettext/tools/rmsgfmt.rb:29 lib/gettext/tools/rgettext.rb:202
-msgid "no input files"
-msgstr "no hi ha fitxers d'entrada"
+#: lib/gettext/tools.rb:68
+msgid "Failed to merge with %{defpo}"
+msgstr "Ha fallat al fer el merge amb %{defpo}"
 
-#: lib/gettext/tools/rmsgfmt.rb:46
-msgid "Usage: %s input.po [-o output.mo]"
-msgstr "Ús: %s entrada.po [-o sortida.mo]"
+#: lib/gettext/tools.rb:69
+msgid "New .pot was copied to %{failed_filename}"
+msgstr "S'ha copiat el nou .pot a %{failed_filename}"
 
-#: lib/gettext/tools/rmsgfmt.rb:48
-msgid "Generate binary message catalog from textual translation description."
+#: lib/gettext/tools.rb:70
+msgid "Check these po/pot-files. It may have syntax errors or something wrong."
 msgstr ""
-"Genera un catàleg de missatges binaris a partir d'un fitxer de traducció "
-"textual."
-
-#: lib/gettext/tools/rmsgfmt.rb:50 lib/gettext/tools/rgettext.rb:159
-#: lib/gettext/tools/rmsgmerge.rb:407
-msgid "Specific options:"
-msgstr "Opcions específiques:"
+"Revisa aquestes po/pot-files. Poden contenir errors o quelcom malament."
 
-#: lib/gettext/tools/rmsgfmt.rb:52 lib/gettext/tools/rgettext.rb:161
-#: lib/gettext/tools/rmsgmerge.rb:409
-msgid "write output to specified file"
-msgstr "escriu la sortida en un fitxer especificat"
+#: lib/gettext/tools.rb:173
+msgid ""
+"`%{cmd}' can not be found. \n"
+"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+msgstr ""
 
-#: lib/gettext/tools/rmsgfmt.rb:56 lib/gettext/tools/rgettext.rb:178
-#: lib/gettext/tools/rmsgmerge.rb:420
-msgid "display version information and exit"
-msgstr "mostra informació de la versió i surt"
+#: lib/gettext/textdomain_manager.rb:147
+msgid "3rd parmeter is wrong: value = %{number}"
+msgstr "El tercer paràmetre es erroni: valor = %{number}"
 
 #: lib/gettext/tools/rgettext.rb:43
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}' ignorat"
 
-#: lib/gettext/tools/rgettext.rb:155
+#: lib/gettext/tools/rgettext.rb:190
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "Ús: %s entrada.po [-r parser.rb] [-o sortida.pot]"
 
-#: lib/gettext/tools/rgettext.rb:157
+#: lib/gettext/tools/rgettext.rb:192
 msgid "Extract translatable strings from given input files."
 msgstr "Extreu les cadenes de paraules traduïbles dels fitxers d'entrada."
 
-#: lib/gettext/tools/rgettext.rb:165
+#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgfmt.rb:50
+#: lib/gettext/tools/rmsgmerge.rb:407
+msgid "Specific options:"
+msgstr "Opcions específiques:"
+
+#: lib/gettext/tools/rgettext.rb:196 lib/gettext/tools/rmsgfmt.rb:52
+#: lib/gettext/tools/rmsgmerge.rb:409
+msgid "write output to specified file"
+msgstr "escriu la sortida en un fitxer especificat"
+
+#: lib/gettext/tools/rgettext.rb:200
 msgid "File '%s' already exists."
 msgstr "El fitxer '%s' ja existeix"
 
-#: lib/gettext/tools/rgettext.rb:170
+#: lib/gettext/tools/rgettext.rb:205
 msgid "require the library before executing rgettext"
 msgstr "requereix la llibreria abans d'executar rgettext"
 
-#: lib/gettext/tools/rgettext.rb:174
+#: lib/gettext/tools/rgettext.rb:209
 msgid "run in debugging mode"
 msgstr "executa en mode debug"
 
+#: lib/gettext/tools/rgettext.rb:213 lib/gettext/tools/rmsgfmt.rb:56
+#: lib/gettext/tools/rmsgmerge.rb:420
+msgid "display version information and exit"
+msgstr "mostra informació de la versió i surt"
+
+#: lib/gettext/tools/rgettext.rb:237 lib/gettext/tools/rmsgfmt.rb:29
+msgid "no input files"
+msgstr "no hi ha fitxers d'entrada"
+
+#: lib/gettext/tools/rmsgfmt.rb:46
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Ús: %s entrada.po [-o sortida.mo]"
+
+#: lib/gettext/tools/rmsgfmt.rb:48
+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/tools/rmsgmerge.rb:402
 msgid "Usage: %s def.po ref.pot [-o output.pot]"
 msgstr "Ús: %s def.po ref.pot [-o sortida.pot]"
@@ -101,24 +116,9 @@ msgstr "no s'ha donat una definició po"
 msgid "reference pot is not given."
 msgstr "no s'ha donat una referència pot"
 
-#: lib/gettext/tools.rb:68
-msgid "Failed to merge with %{defpo}"
-msgstr "Ha fallat al fer el merge amb %{defpo}"
-
-#: lib/gettext/tools.rb:69
-msgid "New .pot was copied to %{failed_filename}"
-msgstr "S'ha copiat el nou .pot a %{failed_filename}"
-
-#: lib/gettext/tools.rb:70
-msgid "Check these po/pot-files. It may have syntax errors or something wrong."
-msgstr ""
-"Revisa aquestes po/pot-files. Poden contenir errors o quelcom malament."
-
-#: lib/gettext/tools.rb:173
-msgid ""
-"`%{cmd}' can not be found. \n"
-"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
-msgstr ""
+#: lib/gettext/parser/glade.rb:75
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "El fitxer `%{file}' no té el format glade-2.0."
 
 #: src/poparser.ry:38 src/poparser.ry:55
 msgid "Warning: fuzzy message was ignored.\n"
@@ -127,3 +127,4 @@ msgstr "Avís: s'ha ignorat el missatge ambigu.\n"
 #: src/poparser.ry:148
 msgid "Warning: obsolete msgid exists.\n"
 msgstr "Avís: existeix un msgid obsolet.\n"
+