diff --git a/Pyblio/GnomeUI/Document.py b/Pyblio/GnomeUI/Document.py
index 75364ec..20c65f8 100644
--- a/Pyblio/GnomeUI/Document.py
+++ b/Pyblio/GnomeUI/Document.py
@@ -436,12 +436,10 @@ class Document (Connector.Publisher):
         
         if li == ld:
             if   ld == 0: num = _("[no entry]")
-            elif ld == 1: num = _("[1 entry]")
-            else:         num = _("[%d entries]")    %  ld
+            else:         num = ngettext("[%d entry]", "[%d entries]", ld) % ld
         else:
             if   ld == 0: num = _("[no entry]")
-            elif ld == 1: num = _("[%d/1 entry]")    % li
-            else:         num = _("[%d/%d entries]") % (li, ld)
+            else:         num = ngettext("[%d/%d entry]", "[%d/%d entries]", ld) % (li, ld)
 
         text = text + ' ' + num
         
@@ -948,7 +946,9 @@ class Document (Connector.Publisher):
         if l == 0: return
 
         if l > 5:
-            if not Utils.Callback (_("Really edit %d entries?")
+            if not Utils.Callback (ngettext("Really edit %d entry?", 
+                                            "Really edit %d entries?", 
+                                            l)
                                    % l, parent = self.w).answer ():
                 return
 
@@ -995,7 +995,7 @@ class Document (Connector.Publisher):
         offset = self.index.get_item_position (entries [-1])
 
         if l > 1:
-            question = _("Remove all the %d entries?") % len (entries)
+            question = ngettext("Remove the %d entry?", "Remove all the %d entries?", l) % l
         else:
             question = _("Remove entry `%s'?") % entries [0].key.key
             
diff --git a/scripts/pybliocheck.py b/scripts/pybliocheck.py
index 06e889b..915fe52 100644
--- a/scripts/pybliocheck.py
+++ b/scripts/pybliocheck.py
@@ -57,7 +57,10 @@ for dir in sys.argv [2:]:
         # try to open the database
         try:
             b = bibopen (f)
-            print (_("file `%s' is ok [%d entries]") % (f, len (b))).encode (charset)
+            print (ngettext("file `%s' is ok [%d entry]", 
+                            "file `%s' is ok [%d entries]", 
+                            len(b)) 
+                   % (f, len (b))).encode (charset)
         except (Exceptions.ParserError, KeyError), err:
             broken.append (str (err))
 
