Index: gnome-sudoku/src/lib/timer.py
===================================================================
--- gnome-sudoku/src/lib/timer.py	(revision 6028)
+++ gnome-sudoku/src/lib/timer.py	(working copy)
@@ -9,19 +9,19 @@
     time = int(time)
     time_strings = []
     units = [(int(365.25*24*60*60),
-              lambda years: ngettext("%s year","%s years",years)%years),
+              lambda years: ngettext("%(n)s year","%(n)s years",years)%{'n':years}),
              (31*24*60*60,
-              lambda months: ngettext("%s month","%s months",months)%months),
+              lambda months: ngettext("%(n)s month","%(n)s months",months)%{'n':months}),
              (7*24*60*60,
-              lambda weeks: ngettext("%s week","%s weeks",weeks)%weeks),
+              lambda weeks: ngettext("%(n)s week","%(n)s weeks",weeks)%{'n':weeks}),
              (24*60*60,
-              lambda days: ngettext("%s day","%s days",days)%days),
+              lambda days: ngettext("%(n)s day","%(n)s days",days)%{'n':days}),
              (60*60,
-              lambda hours: ngettext("%s hour","%s hours",hours)%hours),
+              lambda hours: ngettext("%(n)s hour","%(n)s hours",hours)%{'n':hours}),
              (60,
-              lambda minutes: ngettext("%s minute","%s minutes",minutes)%minutes),
+              lambda minutes: ngettext("%(n)s minute","%(n)s minutes",minutes)%{'n':minutes}),
              (1,
-              lambda seconds: ngettext("%s second","%s seconds",seconds)%seconds)]
+              lambda seconds: ngettext("%(n)s second","%(n)s seconds",seconds)%{'n':seconds})]
     for divisor,unit_formatter in units:
         time_covered = time / divisor
         if time_covered:
Index: gnome-sudoku/src/lib/sudoku_generator_gui.py
===================================================================
--- gnome-sudoku/src/lib/sudoku_generator_gui.py	(revision 6028)
+++ gnome-sudoku/src/lib/sudoku_generator_gui.py	(working copy)
@@ -159,7 +159,7 @@
         else:
             curval = int(curtext.split()[0])
             newval = curval + val
-        newtext = ngettext("%s puzzle","%s puzzles",newval)%newval
+        newtext = ngettext("%(n)s puzzle","%(n)s puzzles",newval)%{'n':newval}
         lab.set_text(newtext)
 
     def update_status (self, *args):
@@ -238,7 +238,7 @@
                     txt = 'Generated %s out of %s puzzles'%(self.toward_target,tot)
         else:
             self.prog.pulse()
-            txt = ngettext('Generated %s puzzle','Generated %s puzzles',self.toward_target)%(self.toward_target)
+            txt = ngettext('Generated %(n)s puzzle','Generated %(n)s puzzles',self.toward_target)%{'n':self.toward_target}
         if self.paused: txt = txt + ' (' + _('Paused') + ')'
         self.prog.set_text(txt)
 
Index: po/sr@Latn.po
===================================================================
--- po/sr@Latn.po	(revision 6108)
+++ po/sr@Latn.po	(working copy)
@@ -5735,8 +5735,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Sledeća slagalica"
 msgstr[1] "Sledeća slagalica"
 msgstr[2] "Sledeća slagalica"
@@ -5757,8 +5757,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Penant slagalica"
 msgstr[1] "Penant slagalica"
 msgstr[2] "Penant slagalica"
@@ -5797,56 +5797,56 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d poen"
 msgstr[1] "%d poena"
 msgstr[2] "%d poena"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Drugi dan igranja"
 msgstr[1] "Drugi dan igranja"
 msgstr[2] "Drugi dan igranja"
Index: po/cs.po
===================================================================
--- po/cs.po	(revision 6108)
+++ po/cs.po	(working copy)
@@ -5728,8 +5728,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Následující hádanka"
 msgstr[1] "Následující hádanka"
 msgstr[2] "Následující hádanka"
@@ -5750,8 +5750,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Pennant Puzzle"
 msgstr[1] "Pennant Puzzle"
 msgstr[2] "Pennant Puzzle"
@@ -5790,56 +5790,56 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d bod"
 msgstr[1] "%d body"
 msgstr[2] "%d bodů"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Můj druhý den"
 msgstr[1] "Můj druhý den"
 msgstr[2] "Můj druhý den"
Index: po/pt_BR.po
===================================================================
--- po/pt_BR.po	(revision 6108)
+++ po/pt_BR.po	(working copy)
@@ -5819,10 +5819,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s quebra-cabeça"
-msgstr[1] "%s quebra-cabeças"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s quebra-cabeça"
+msgstr[1] "%(n)s quebra-cabeças"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5838,10 +5838,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "%s quebra-cabeça gerado"
-msgstr[1] "%s quebra-cabeças gerados"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "%(n)s quebra-cabeça gerado"
+msgstr[1] "%(n)s quebra-cabeças gerados"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -5872,52 +5872,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s ano"
-msgstr[1] "%s anos"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s ano"
+msgstr[1] "%(n)s anos"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s mês"
-msgstr[1] "%s meses"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s mês"
+msgstr[1] "%(n)s meses"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s semana"
-msgstr[1] "%s semanas"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s semana"
+msgstr[1] "%(n)s semanas"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s dia"
-msgstr[1] "%s dias"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s dia"
+msgstr[1] "%(n)s dias"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s hora"
-msgstr[1] "%s horas"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s hora"
+msgstr[1] "%(n)s horas"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minuto"
-msgstr[1] "%s minutos"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minuto"
+msgstr[1] "%(n)s minutos"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s segundo"
-msgstr[1] "%s segundos"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s segundo"
+msgstr[1] "%(n)s segundos"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
@@ -8594,15 +8594,15 @@
 #~ msgid "paused"
 #~ msgstr "pausado"
 
-#~ msgid "%s hint"
-#~ msgid_plural "%s hints"
-#~ msgstr[0] "%s dica"
-#~ msgstr[1] "%s dicas"
+#~ msgid "%(n)s hint"
+#~ msgid_plural "%(n)s hints"
+#~ msgstr[0] "%(n)s dica"
+#~ msgstr[1] "%(n)s dicas"
 
-#~ msgid "%s auto-fill"
-#~ msgid_plural "%s auto-fills"
-#~ msgstr[0] "%s preenchimento automático"
-#~ msgstr[1] "%s preenchimentos automáticos"
+#~ msgid "%(n)s auto-fill"
+#~ msgid_plural "%(n)s auto-fills"
+#~ msgstr[0] "%(n)s preenchimento automático"
+#~ msgstr[1] "%(n)s preenchimentos automáticos"
 
 #~ msgid "Number of guesses required to solve: "
 #~ msgstr "Número de adivinhações necessárias para resolver: "
Index: po/mk.po
===================================================================
--- po/mk.po	(revision 6108)
+++ po/mk.po	(working copy)
@@ -5788,11 +5788,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s сложувалка"
-msgstr[1] "%s сложувалки"
-msgstr[2] "%s сложувалки"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s сложувалка"
+msgstr[1] "%(n)s сложувалки"
+msgstr[2] "%(n)s сложувалки"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5809,11 +5809,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Генерирана е  %s сложувалка"
-msgstr[1] "Генерирани се  %s сложувалки"
-msgstr[2] "Генерирани се  %s сложувалки"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Генерирана е  %(n)s сложувалка"
+msgstr[1] "Генерирани се  %(n)s сложувалки"
+msgstr[2] "Генерирани се  %(n)s сложувалки"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5844,59 +5844,59 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s година"
-msgstr[1] "%s години"
-msgstr[2] "%s години"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s година"
+msgstr[1] "%(n)s години"
+msgstr[2] "%(n)s години"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s месец"
-msgstr[1] "%s месеци"
-msgstr[2] "%s месеци"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s месец"
+msgstr[1] "%(n)s месеци"
+msgstr[2] "%(n)s месеци"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s недела"
-msgstr[1] "%s недели"
-msgstr[2] "%s недели"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s недела"
+msgstr[1] "%(n)s недели"
+msgstr[2] "%(n)s недели"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s ден"
-msgstr[1] "%s денови"
-msgstr[2] "%s денови"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s ден"
+msgstr[1] "%(n)s денови"
+msgstr[2] "%(n)s денови"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s час"
-msgstr[1] "%s часови"
-msgstr[2] "%s часови"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s час"
+msgstr[1] "%(n)s часови"
+msgstr[2] "%(n)s часови"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s минута"
-msgstr[1] "%s минути"
-msgstr[2] "%s минути"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s минута"
+msgstr[1] "%(n)s минути"
+msgstr[2] "%(n)s минути"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s секунда"
-msgstr[1] "%s секунди"
-msgstr[2] "%s секунди"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s секунда"
+msgstr[1] "%(n)s секунди"
+msgstr[2] "%(n)s секунди"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/es.po
===================================================================
--- po/es.po	(revision 6108)
+++ po/es.po	(working copy)
@@ -5817,10 +5817,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s puzzle"
-msgstr[1] "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s puzzle"
+msgstr[1] "%(n)s puzzles"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5836,10 +5836,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Generado %s puzzle"
-msgstr[1] "Generados %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Generado %(n)s puzzle"
+msgstr[1] "Generados %(n)s puzzles"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -5870,52 +5870,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s año"
-msgstr[1] "%s años"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s año"
+msgstr[1] "%(n)s años"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s mes"
-msgstr[1] "%s meses"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s mes"
+msgstr[1] "%(n)s meses"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s semana"
-msgstr[1] "%s semanas"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s semana"
+msgstr[1] "%(n)s semanas"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s día"
-msgstr[1] "%s días"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s día"
+msgstr[1] "%(n)s días"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s hora"
-msgstr[1] "%s horas"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s hora"
+msgstr[1] "%(n)s horas"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minuto"
-msgstr[1] "%s minutos"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minuto"
+msgstr[1] "%(n)s minutos"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s segundo"
-msgstr[1] "%s segundos"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s segundo"
+msgstr[1] "%(n)s segundos"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/ko.po
===================================================================
--- po/ko.po	(revision 6108)
+++ po/ko.po	(working copy)
@@ -5773,9 +5773,9 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s개 퍼즐"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s개 퍼즐"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5790,9 +5790,9 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "%s개 퍼즐 만듦"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "%(n)s개 퍼즐 만듦"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5823,45 +5823,45 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s년"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s년"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s달"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s달"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s주"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s주"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s일"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s일"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s시간"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s시간"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s분"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s분"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s초"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s초"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/is.po
===================================================================
--- po/is.po	(revision 6108)
+++ po/is.po	(working copy)
@@ -5819,8 +5819,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5839,8 +5839,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5879,50 +5879,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Annar dagurinn minn"
 msgstr[1] "Annar dagurinn minn"
 
Index: po/sk.po
===================================================================
--- po/sk.po	(revision 6108)
+++ po/sk.po	(working copy)
@@ -5812,8 +5812,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5834,8 +5834,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5874,56 +5874,56 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d bodov"
 msgstr[1] "%d bod"
 msgstr[2] "%d body"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Druhý deň"
 msgstr[1] "Druhý deň"
 msgstr[2] "Druhý deň"
Index: po/ms.po
===================================================================
--- po/ms.po	(revision 6108)
+++ po/ms.po	(working copy)
@@ -5806,8 +5806,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5826,8 +5826,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5865,50 +5865,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Hari kedua saya"
 msgstr[1] "Hari kedua saya"
 
Index: po/uk.po
===================================================================
--- po/uk.po	(revision 6108)
+++ po/uk.po	(working copy)
@@ -5787,11 +5787,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s головоломка"
-msgstr[1] "%s головоломки"
-msgstr[2] "%s головоломок"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s головоломка"
+msgstr[1] "%(n)s головоломки"
+msgstr[2] "%(n)s головоломок"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5808,11 +5808,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Створена %s головоломка"
-msgstr[1] "Створена %s головоломка"
-msgstr[2] "Створена %s головоломка"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Створена %(n)s головоломка"
+msgstr[1] "Створена %(n)s головоломка"
+msgstr[2] "Створена %(n)s головоломка"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -5843,59 +5843,59 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0]  "%s рік"
-msgstr[1]  "%s роки"
-msgstr[2]  "%s років"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0]  "%(n)s рік"
+msgstr[1]  "%(n)s роки"
+msgstr[2]  "%(n)s років"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s місяць"
-msgstr[1] "%s місяці"
-msgstr[2] "%s місяців"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s місяць"
+msgstr[1] "%(n)s місяці"
+msgstr[2] "%(n)s місяців"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s тиждень"
-msgstr[1] "%s тижні"
-msgstr[2] "%s тижнів"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s тиждень"
+msgstr[1] "%(n)s тижні"
+msgstr[2] "%(n)s тижнів"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s день"
-msgstr[1] "%s дні"
-msgstr[2] "%s днів"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s день"
+msgstr[1] "%(n)s дні"
+msgstr[2] "%(n)s днів"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s година"
-msgstr[1] "%s години"
-msgstr[2] "%s годин"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s година"
+msgstr[1] "%(n)s години"
+msgstr[2] "%(n)s годин"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s хвилин"
-msgstr[1] "%s хвилини"
-msgstr[2] "%s хвилин"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s хвилин"
+msgstr[1] "%(n)s хвилини"
+msgstr[2] "%(n)s хвилин"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s секунда"
-msgstr[1] "%s секунди"
-msgstr[2] "%s секунд"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s секунда"
+msgstr[1] "%(n)s секунди"
+msgstr[2] "%(n)s секунд"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/ro.po
===================================================================
--- po/ro.po	(revision 6108)
+++ po/ro.po	(working copy)
@@ -5739,11 +5739,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s joc"
-msgstr[1] "%s jocuri"
-msgstr[2] "%s de jocuri"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s joc"
+msgstr[1] "%(n)s jocuri"
+msgstr[2] "%(n)s de jocuri"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:181
 #, fuzzy
@@ -5761,8 +5761,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Puzzle steag"
 msgstr[1] "Puzzle steag"
 msgstr[2] "Puzzle steag"
@@ -5800,59 +5800,59 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s an"
-msgstr[1] "%s ani"
-msgstr[2] "%s de ani"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s an"
+msgstr[1] "%(n)s ani"
+msgstr[2] "%(n)s de ani"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s lună"
-msgstr[1] "%s luni"
-msgstr[2] "%s de luni"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s lună"
+msgstr[1] "%(n)s luni"
+msgstr[2] "%(n)s de luni"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s săptămână"
-msgstr[1] "%s săptămâni"
-msgstr[2] "%s de săptămâni"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s săptămână"
+msgstr[1] "%(n)s săptămâni"
+msgstr[2] "%(n)s de săptămâni"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s zi"
-msgstr[1] "%s zile"
-msgstr[2] "%s de zile"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s zi"
+msgstr[1] "%(n)s zile"
+msgstr[2] "%(n)s de zile"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s oră"
-msgstr[1] "%s ore"
-msgstr[2] "%s de ore"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s oră"
+msgstr[1] "%(n)s ore"
+msgstr[2] "%(n)s de ore"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minut"
-msgstr[1] "%s minute"
-msgstr[2] "%s de minute"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minut"
+msgstr[1] "%(n)s minute"
+msgstr[2] "%(n)s de minute"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s secundă"
-msgstr[1] "%s secunde"
-msgstr[2] "%s de secunde"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s secundă"
+msgstr[1] "%(n)s secunde"
+msgstr[2] "%(n)s de secunde"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/rw.po
===================================================================
--- po/rw.po	(revision 6108)
+++ po/rw.po	(working copy)
@@ -6372,8 +6372,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6392,8 +6392,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6434,49 +6434,49 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%dAkadomo"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "ISEGONDA UMUNSI"
 msgstr[1] "ISEGONDA UMUNSI"
 
Index: po/nb.po
===================================================================
--- po/nb.po	(revision 6108)
+++ po/nb.po	(working copy)
@@ -5729,10 +5729,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s puslespill"
-msgstr[1] "%s puslespill"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s puslespill"
+msgstr[1] "%(n)s puslespill"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5748,10 +5748,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "%s puslespill generert"
-msgstr[1] "%s puslespill generert"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "%(n)s puslespill generert"
+msgstr[1] "%(n)s puslespill generert"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:601
 msgid "Very Hard"
@@ -5782,52 +5782,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s år"
-msgstr[1] "%s år"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s år"
+msgstr[1] "%(n)s år"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s måned"
-msgstr[1] "%s måneder"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s måned"
+msgstr[1] "%(n)s måneder"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s uke"
-msgstr[1] "%s uker"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s uke"
+msgstr[1] "%(n)s uker"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s dag"
-msgstr[1] "%s dager"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s dag"
+msgstr[1] "%(n)s dager"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s time"
-msgstr[1] "%s timer"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s time"
+msgstr[1] "%(n)s timer"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minutt"
-msgstr[1] "%s minutter"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minutt"
+msgstr[1] "%(n)s minutter"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s sekund"
-msgstr[1] "%s sekunder"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s sekund"
+msgstr[1] "%(n)s sekunder"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/bn.po
===================================================================
--- po/bn.po	(revision 6108)
+++ po/bn.po	(working copy)
@@ -5754,8 +5754,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "পরবর্তী ধাঁধা"
 msgstr[1] "পরবর্তী ধাঁধা"
 
@@ -5774,8 +5774,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "বাদামের ধাঁধা"
 msgstr[1] "বাদামের ধাঁধা"
 
@@ -5812,52 +5812,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s বছর"
-msgstr[1] "%s বছর"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s বছর"
+msgstr[1] "%(n)s বছর"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s মাস"
-msgstr[1] "%s মাস"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s মাস"
+msgstr[1] "%(n)s মাস"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s সপ্তাহ"
-msgstr[1] "%s সপ্তাহ"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s সপ্তাহ"
+msgstr[1] "%(n)s সপ্তাহ"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s দিন"
-msgstr[1] "%s দিন"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s দিন"
+msgstr[1] "%(n)s দিন"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s ঘন্টা"
-msgstr[1] "%s ঘন্টা"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s ঘন্টা"
+msgstr[1] "%(n)s ঘন্টা"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s মিনিট"
-msgstr[1] "%s মিনিট"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s মিনিট"
+msgstr[1] "%(n)s মিনিট"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s সেকেন্ড"
-msgstr[1] "%s সেকেন্ড"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s সেকেন্ড"
+msgstr[1] "%(n)s সেকেন্ড"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/ar.po
===================================================================
--- po/ar.po	(revision 6108)
+++ po/ar.po	(working copy)
@@ -5921,12 +5921,12 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "لغز"
 msgstr[1] "لغزين"
-msgstr[2] "%s ألغاز"
-msgstr[3] "%s لغزاً"
+msgstr[2] "%(n)s ألغاز"
+msgstr[3] "%(n)s لغزاً"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5944,12 +5944,12 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "تم توليد لغز"
 msgstr[1] "تم توليد لغزين"
-msgstr[2] "تم توليد %s ألغاز"
-msgstr[3] "تم توليد %s لغزاً"
+msgstr[2] "تم توليد %(n)s ألغاز"
+msgstr[3] "تم توليد %(n)s لغزاً"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5980,66 +5980,66 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] "سنة واحدة"
 msgstr[1] "سنتان"
-msgstr[2] "%s سنين"
-msgstr[3] "%s سنوات"
+msgstr[2] "%(n)s سنين"
+msgstr[3] "%(n)s سنوات"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "شهر واحد"
 msgstr[1] "شهران"
-msgstr[2] "%s أشهر"
-msgstr[3] "%s شهراً"
+msgstr[2] "%(n)s أشهر"
+msgstr[3] "%(n)s شهراً"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] "أسبوع واحد"
 msgstr[1] "أسبوعان"
-msgstr[2] "%s أسابيع"
-msgstr[3] "%s أسبوعاً"
+msgstr[2] "%(n)s أسابيع"
+msgstr[3] "%(n)s أسبوعاً"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] "يوم واحد"
 msgstr[1] "يومان"
-msgstr[2] "%s أيام"
-msgstr[3] "%s يوماً"
+msgstr[2] "%(n)s أيام"
+msgstr[3] "%(n)s يوماً"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] "ساعة واحدة"
 msgstr[1] "ساعتان"
-msgstr[2] "%s ساعات"
-msgstr[3] "%s ساعة"
+msgstr[2] "%(n)s ساعات"
+msgstr[3] "%(n)s ساعة"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] "دقيقة واحدة"
 msgstr[1] "دقيقتان"
-msgstr[2] "%s دقائق"
-msgstr[3] "%s دقيقة"
+msgstr[2] "%(n)s دقائق"
+msgstr[3] "%(n)s دقيقة"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "ثانية"
 msgstr[1] "ثانيتان"
-msgstr[2] "%s ثوان"
-msgstr[3] "%s ثانية"
+msgstr[2] "%(n)s ثوان"
+msgstr[3] "%(n)s ثانية"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/zh_HK.po
===================================================================
--- po/zh_HK.po	(revision 6108)
+++ po/zh_HK.po	(working copy)
@@ -5725,8 +5725,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
@@ -5742,8 +5742,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
@@ -5775,45 +5775,45 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s 年"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s 年"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s 個月"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s 個月"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s 星期"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s 星期"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s 日"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s 日"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s 小時"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s 小時"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s 分鐘"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s 分鐘"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s 秒"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s 秒"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/fr.po
===================================================================
--- po/fr.po	(revision 6108)
+++ po/fr.po	(working copy)
@@ -5862,10 +5862,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s grille"
-msgstr[1] "%s grilles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s grille"
+msgstr[1] "%(n)s grilles"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5881,10 +5881,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "%s grille générée"
-msgstr[1] "%s grilles générées"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "%(n)s grille générée"
+msgstr[1] "%(n)s grilles générées"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5915,52 +5915,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s an"
-msgstr[1] "%s ans"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s an"
+msgstr[1] "%(n)s ans"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s mois"
-msgstr[1] "%s mois"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s mois"
+msgstr[1] "%(n)s mois"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s semaine"
-msgstr[1] "%s semaines"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s semaine"
+msgstr[1] "%(n)s semaines"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s jour"
-msgstr[1] "%s jours"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s jour"
+msgstr[1] "%(n)s jours"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s heure"
-msgstr[1] "%s heures"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s heure"
+msgstr[1] "%(n)s heures"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minute"
-msgstr[1] "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minute"
+msgstr[1] "%(n)s minutes"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s seconde"
-msgstr[1] "%s secondes"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s seconde"
+msgstr[1] "%(n)s secondes"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/hr.po
===================================================================
--- po/hr.po	(revision 6108)
+++ po/hr.po	(working copy)
@@ -5812,8 +5812,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5834,8 +5834,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5875,56 +5875,56 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Drugi dan igranja"
 msgstr[1] "Drugi dan igranja"
 msgstr[2] "Drugi dan igranja"
Index: po/mn.po
===================================================================
--- po/mn.po	(revision 6108)
+++ po/mn.po	(working copy)
@@ -5815,8 +5815,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5835,8 +5835,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5875,50 +5875,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Миний хоёр дахь өдөр"
 msgstr[1] "Миний хоёр дахь өдөр"
 
Index: po/az.po
===================================================================
--- po/az.po	(revision 6108)
+++ po/az.po	(working copy)
@@ -5801,8 +5801,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5821,8 +5821,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5861,50 +5861,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Mənim ikinci günüm"
 msgstr[1] "Mənim ikinci günüm"
 
Index: po/nn.po
===================================================================
--- po/nn.po	(revision 6108)
+++ po/nn.po	(working copy)
@@ -5781,8 +5781,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5801,8 +5801,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5841,50 +5841,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Andre dagen"
 msgstr[1] "Andre dagen"
 
Index: po/dz.po
===================================================================
--- po/dz.po	(revision 6108)
+++ po/dz.po	(working copy)
@@ -5827,10 +5827,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s སྒྲིག་རྩེད་"
-msgstr[1] "%s སྒྲིག་རྩེད་ཚུ་"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s སྒྲིག་རྩེད་"
+msgstr[1] "%(n)s སྒྲིག་རྩེད་ཚུ་"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5846,10 +5846,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] " %s སྒྲིག་རྩེད་བཟོ་བཏོན་འབད་ཡོད་"
-msgstr[1] " %s སྒྲིག་རྩེད་ཚུ་བཟོ་བཏོན་འབད་ཡོད་"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] " %(n)s སྒྲིག་རྩེད་བཟོ་བཏོན་འབད་ཡོད་"
+msgstr[1] " %(n)s སྒྲིག་རྩེད་ཚུ་བཟོ་བཏོན་འབད་ཡོད་"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5880,52 +5880,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s ལོ་"
-msgstr[1] "%s ལོ་ཚུ་"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s ལོ་"
+msgstr[1] "%(n)s ལོ་ཚུ་"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s ཟླཝ་"
-msgstr[1] "%s ཟླཝ་ཚུ་"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s ཟླཝ་"
+msgstr[1] "%(n)s ཟླཝ་ཚུ་"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s བདུན་ཕྲག་"
-msgstr[1] "%s བདུན་ཕྲག་ཚུ་"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s བདུན་ཕྲག་"
+msgstr[1] "%(n)s བདུན་ཕྲག་ཚུ་"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s ཉིནམ་"
-msgstr[1] "%s ཉིནམ་ཚུ་"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s ཉིནམ་"
+msgstr[1] "%(n)s ཉིནམ་ཚུ་"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s ཆུ་ཚོད་r"
-msgstr[1] "%s ཆུ་ཚོད་ཚུ་"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s ཆུ་ཚོད་r"
+msgstr[1] "%(n)s ཆུ་ཚོད་ཚུ་"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s སྐར་མ་"
-msgstr[1] "%s སྐར་མ་ཚུ་"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s སྐར་མ་"
+msgstr[1] "%(n)s སྐར་མ་ཚུ་"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s སྐར་ཆ་"
-msgstr[1] "%s སྐར་ཆ་ཚུ་	"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s སྐར་ཆ་"
+msgstr[1] "%(n)s སྐར་ཆ་ཚུ་	"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/mr.po
===================================================================
--- po/mr.po	(revision 6108)
+++ po/mr.po	(working copy)
@@ -5713,8 +5713,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "पुढिल कोडं"
 msgstr[1] "पुढिल कोडं"
 
@@ -5733,8 +5733,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "पैनांट कोडं"
 msgstr[1] "पैनांट कोडं"
 
@@ -5772,50 +5772,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d गुण"
 msgstr[1] "%d गुण"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "माझा दुसरा दिवस"
 msgstr[1] "माझा दुसरा दिवस"
 
Index: po/or.po
===================================================================
--- po/or.po	(revision 6108)
+++ po/or.po	(working copy)
@@ -5520,8 +5520,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5540,8 +5540,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5578,50 +5578,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
Index: po/lv.po
===================================================================
--- po/lv.po	(revision 6108)
+++ po/lv.po	(working copy)
@@ -5730,8 +5730,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Nākamā mīkla"
 msgstr[1] "Nākamā mīkla"
 msgstr[2] "Nākamā mīkla"
@@ -5752,8 +5752,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Karodziņa mīkla"
 msgstr[1] "Karodziņa mīkla"
 msgstr[2] "Karodziņa mīkla"
@@ -5792,56 +5792,56 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d punkts"
 msgstr[1] "%d punkti"
 msgstr[2] "%d punkti"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Mana otrā diena"
 msgstr[1] "Mana otrā diena"
 msgstr[2] "Mana otrā diena"
Index: po/ca.po
===================================================================
--- po/ca.po	(revision 6108)
+++ po/ca.po	(working copy)
@@ -5840,10 +5840,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s trencaclosques"
-msgstr[1] "%s trencaclosques"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s trencaclosques"
+msgstr[1] "%(n)s trencaclosques"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5859,10 +5859,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "S'ha generat %s trencaclosques"
-msgstr[1] "S'han generat %s trencaclosques"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "S'ha generat %(n)s trencaclosques"
+msgstr[1] "S'han generat %(n)s trencaclosques"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:601
 msgid "Very Hard"
@@ -5893,52 +5893,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s any"
-msgstr[1] "%s anys"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s any"
+msgstr[1] "%(n)s anys"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s mes"
-msgstr[1] "%s mesos"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s mes"
+msgstr[1] "%(n)s mesos"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s setmana"
-msgstr[1] "%s setmanes"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s setmana"
+msgstr[1] "%(n)s setmanes"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s dia"
-msgstr[1] "%s dies"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s dia"
+msgstr[1] "%(n)s dies"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s hora"
-msgstr[1] "%s hores"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s hora"
+msgstr[1] "%(n)s hores"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minut"
-msgstr[1] "%s minuts"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minut"
+msgstr[1] "%(n)s minuts"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s segon"
-msgstr[1] "%s segons"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s segon"
+msgstr[1] "%(n)s segons"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/da.po
===================================================================
--- po/da.po	(revision 6108)
+++ po/da.po	(working copy)
@@ -5814,10 +5814,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s opgave"
-msgstr[1] "%s opgaver"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s opgave"
+msgstr[1] "%(n)s opgaver"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5834,10 +5834,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Genererede %s opgave"
-msgstr[1] "Genererede %s opgaver"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Genererede %(n)s opgave"
+msgstr[1] "Genererede %(n)s opgaver"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -5868,52 +5868,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s år"
-msgstr[1] "%s år"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s år"
+msgstr[1] "%(n)s år"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s måned"
-msgstr[1] "%s måneder"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s måned"
+msgstr[1] "%(n)s måneder"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s uge"
-msgstr[1] "%s uger"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s uge"
+msgstr[1] "%(n)s uger"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s dag"
-msgstr[1] "%s dage"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s dag"
+msgstr[1] "%(n)s dage"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s time"
-msgstr[1] "%s timer"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s time"
+msgstr[1] "%(n)s timer"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minut"
-msgstr[1] "%s minutter"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minut"
+msgstr[1] "%(n)s minutter"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s sekund"
-msgstr[1] "%s sekunder"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s sekund"
+msgstr[1] "%(n)s sekunder"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/sr.po
===================================================================
--- po/sr.po	(revision 6108)
+++ po/sr.po	(working copy)
@@ -5735,8 +5735,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Следећа слагалица"
 msgstr[1] "Следећа слагалица"
 msgstr[2] "Следећа слагалица"
@@ -5757,8 +5757,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Пенант слагалица"
 msgstr[1] "Пенант слагалица"
 msgstr[2] "Пенант слагалица"
@@ -5797,56 +5797,56 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d поен"
 msgstr[1] "%d поена"
 msgstr[2] "%d поена"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Други дан играња"
 msgstr[1] "Други дан играња"
 msgstr[2] "Други дан играња"
Index: po/bn_IN.po
===================================================================
--- po/bn_IN.po	(revision 6108)
+++ po/bn_IN.po	(working copy)
@@ -5760,8 +5760,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "পরবর্তী ধাঁধা"
 msgstr[1] "পরবর্তী ধাঁধা"
 
@@ -5780,8 +5780,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "বাদামের ধাঁধা"
 msgstr[1] "বাদামের ধাঁধা"
 
@@ -5819,50 +5819,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d পয়েন্ট"
 msgstr[1] "%d পয়েন্ট"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "নিবল খেলার দ্বিতীয় দিন"
 msgstr[1] "নিবল খেলার দ্বিতীয় দিন"
 
Index: po/tr.po
===================================================================
--- po/tr.po	(revision 6108)
+++ po/tr.po	(working copy)
@@ -5665,9 +5665,9 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s bulmaca"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s bulmaca"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:181
 #, fuzzy
@@ -5683,8 +5683,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Flama Bulmacası"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:599
@@ -5720,45 +5720,45 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s yıl"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s yıl"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s ay"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s ay"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s hafta"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s hafta"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s gün"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s gün"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s saat"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s saat"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s dakika"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s dakika"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s saniye"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s saniye"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/be.po
===================================================================
--- po/be.po	(revision 6108)
+++ po/be.po	(working copy)
@@ -5903,8 +5903,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5923,8 +5923,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5963,50 +5963,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Мой другі дзень"
 msgstr[1] "Мой другі дзень"
 
Index: po/fa.po
===================================================================
--- po/fa.po	(revision 6108)
+++ po/fa.po	(working copy)
@@ -5720,8 +5720,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "جورچین بعدی"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:181
@@ -5738,8 +5738,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "جورچین پِنَنت"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:599
@@ -5776,44 +5776,44 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%Id امتیاز"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "روز دوم"
 
 #. Translators... this is a messay way of concatenating
Index: po/ga.po
===================================================================
--- po/ga.po	(revision 6108)
+++ po/ga.po	(working copy)
@@ -5685,8 +5685,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5705,8 +5705,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5745,50 +5745,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
Index: po/de.po
===================================================================
--- po/de.po	(revision 6108)
+++ po/de.po	(working copy)
@@ -5886,10 +5886,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s Puzzle"
-msgstr[1] "%s Puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s Puzzle"
+msgstr[1] "%(n)s Puzzles"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5905,10 +5905,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "%s Puzzle generiert"
-msgstr[1] "%s Puzzles generiert"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "%(n)s Puzzle generiert"
+msgstr[1] "%(n)s Puzzles generiert"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -5939,52 +5939,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s Jahr"
-msgstr[1] "%s Jahre"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s Jahr"
+msgstr[1] "%(n)s Jahre"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s Monat"
-msgstr[1] "%s Monate"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s Monat"
+msgstr[1] "%(n)s Monate"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s Woche"
-msgstr[1] "%s Wochen"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s Woche"
+msgstr[1] "%(n)s Wochen"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s Tag"
-msgstr[1] "%s Tage"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s Tag"
+msgstr[1] "%(n)s Tage"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s Stunde"
-msgstr[1] "%s Stunden"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s Stunde"
+msgstr[1] "%(n)s Stunden"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s Minute"
-msgstr[1] "%s Minuten"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s Minute"
+msgstr[1] "%(n)s Minuten"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s Sekunde"
-msgstr[1] "%s Sekunden"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s Sekunde"
+msgstr[1] "%(n)s Sekunden"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/sv.po
===================================================================
--- po/sv.po	(revision 6108)
+++ po/sv.po	(working copy)
@@ -5962,10 +5962,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s rebus"
-msgstr[1] "%s rebusar"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s rebus"
+msgstr[1] "%(n)s rebusar"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5981,10 +5981,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Genererade %s pussel"
-msgstr[1] "Genererade %s pussel"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Genererade %(n)s pussel"
+msgstr[1] "Genererade %(n)s pussel"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -6015,52 +6015,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s år"
-msgstr[1] "%s år"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s år"
+msgstr[1] "%(n)s år"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s månad"
-msgstr[1] "%s månader"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s månad"
+msgstr[1] "%(n)s månader"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s vecka"
-msgstr[1] "%s veckor"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s vecka"
+msgstr[1] "%(n)s veckor"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s dag"
-msgstr[1] "%s dagar"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s dag"
+msgstr[1] "%(n)s dagar"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s timme"
-msgstr[1] "%s timmar"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s timme"
+msgstr[1] "%(n)s timmar"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minut"
-msgstr[1] "%s minuter"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minut"
+msgstr[1] "%(n)s minuter"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s sekund"
-msgstr[1] "%s sekunder"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s sekund"
+msgstr[1] "%(n)s sekunder"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/ja.po
===================================================================
--- po/ja.po	(revision 6108)
+++ po/ja.po	(working copy)
@@ -5789,10 +5789,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] " %s個のパズル"
-msgstr[1] " %s個のパズル"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] " %(n)s個のパズル"
+msgstr[1] " %(n)s個のパズル"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5808,10 +5808,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] " %s個のパズルの生成中"
-msgstr[1] " %s個のパズルの生成中"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] " %(n)s個のパズルの生成中"
+msgstr[1] " %(n)s個のパズルの生成中"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5842,52 +5842,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] " %s年"
-msgstr[1] " %s年"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] " %(n)s年"
+msgstr[1] " %(n)s年"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] " %sヶ月"
-msgstr[1] " %sヶ月"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] " %(n)sヶ月"
+msgstr[1] " %(n)sヶ月"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] " %s週間"
-msgstr[1] " %s週間"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] " %(n)s週間"
+msgstr[1] " %(n)s週間"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] " %s日"
-msgstr[1] " %s日"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] " %(n)s日"
+msgstr[1] " %(n)s日"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] " %s時間"
-msgstr[1] " %s時間"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] " %(n)s時間"
+msgstr[1] " %(n)s時間"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] " %s分"
-msgstr[1] " %s分"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] " %(n)s分"
+msgstr[1] " %(n)s分"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] " %s秒"
-msgstr[1] " %s秒"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] " %(n)s秒"
+msgstr[1] " %(n)s秒"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/ka.po
===================================================================
--- po/ka.po	(revision 6108)
+++ po/ka.po	(working copy)
@@ -5932,8 +5932,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "შემდეგი"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:181
@@ -5950,8 +5950,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/sudoku.py:599
@@ -5988,44 +5988,44 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "ჩემი მეორე დღე"
 
 #. Translators... this is a messay way of concatenating
Index: po/zh_TW.po
===================================================================
--- po/zh_TW.po	(revision 6108)
+++ po/zh_TW.po	(working copy)
@@ -5753,8 +5753,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
@@ -5770,8 +5770,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
@@ -5803,45 +5803,45 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s 年"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s 年"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s 個月"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s 個月"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s 星期"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s 星期"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s 日"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s 日"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s 小時"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s 小時"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s 分鐘"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s 分鐘"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s 秒"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s 秒"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/he.po
===================================================================
--- po/he.po	(revision 6108)
+++ po/he.po	(working copy)
@@ -5761,8 +5761,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5781,8 +5781,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5820,50 +5820,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "היום השני שלי"
 msgstr[1] "היום השני שלי"
 
Index: po/am.po
===================================================================
--- po/am.po	(revision 6108)
+++ po/am.po	(working copy)
@@ -5626,8 +5626,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5646,8 +5646,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5685,50 +5685,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
Index: po/fi.po
===================================================================
--- po/fi.po	(revision 6108)
+++ po/fi.po	(working copy)
@@ -5794,10 +5794,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s pulma"
-msgstr[1] "%s pulmaa"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s pulma"
+msgstr[1] "%(n)s pulmaa"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5813,10 +5813,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Luotiin %s pulma"
-msgstr[1] "Luotiin %s pulmaa"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Luotiin %(n)s pulma"
+msgstr[1] "Luotiin %(n)s pulmaa"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -5847,52 +5847,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s vuosi"
-msgstr[1] "%s vuotta"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s vuosi"
+msgstr[1] "%(n)s vuotta"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s kuukausi "
-msgstr[1] "%s kuukautta"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s kuukausi "
+msgstr[1] "%(n)s kuukautta"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s viikko"
-msgstr[1] "%s viikkoa"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s viikko"
+msgstr[1] "%(n)s viikkoa"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s päivä"
-msgstr[1] "%s päivää"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s päivä"
+msgstr[1] "%(n)s päivää"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s tunti"
-msgstr[1] "%s tuntia"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s tunti"
+msgstr[1] "%(n)s tuntia"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minuutti"
-msgstr[1] "%s minuuttia"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minuutti"
+msgstr[1] "%(n)s minuuttia"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s sekuntia"
-msgstr[1] "%s sekuntia"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s sekuntia"
+msgstr[1] "%(n)s sekuntia"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/pa.po
===================================================================
--- po/pa.po	(revision 6108)
+++ po/pa.po	(working copy)
@@ -5744,10 +5744,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s ਬੁਝਾਰਤ"
-msgstr[1] "%s ਬੁਝਾਰਤਾਂ"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s ਬੁਝਾਰਤ"
+msgstr[1] "%(n)s ਬੁਝਾਰਤਾਂ"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5763,10 +5763,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "%s ਬੁਝਾਰਤ ਤਿਆਰ ਕੀਤੀ"
-msgstr[1] "%s ਬੁਝਾਰਤਾਂ ਤਿਆਰ ਕੀਤੀਆਂ"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "%(n)s ਬੁਝਾਰਤ ਤਿਆਰ ਕੀਤੀ"
+msgstr[1] "%(n)s ਬੁਝਾਰਤਾਂ ਤਿਆਰ ਕੀਤੀਆਂ"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5797,52 +5797,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s ਸਾਲ"
-msgstr[1] "%s ਸਾਲ"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s ਸਾਲ"
+msgstr[1] "%(n)s ਸਾਲ"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s ਮਹੀਨਾ"
-msgstr[1] "%s ਮਹੀਨੇ"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s ਮਹੀਨਾ"
+msgstr[1] "%(n)s ਮਹੀਨੇ"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s ਹਫ਼ਤਾ"
-msgstr[1] "%s ਹਫ਼ਤੇ"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s ਹਫ਼ਤਾ"
+msgstr[1] "%(n)s ਹਫ਼ਤੇ"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s ਦਿਨ"
-msgstr[1] "%s ਦਿਨ"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s ਦਿਨ"
+msgstr[1] "%(n)s ਦਿਨ"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s ਘੰਟਾ"
-msgstr[1] "%s ਘੰਟੇ"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s ਘੰਟਾ"
+msgstr[1] "%(n)s ਘੰਟੇ"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s ਮਿੰਟ"
-msgstr[1] "%s ਮਿੰਟ"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s ਮਿੰਟ"
+msgstr[1] "%(n)s ਮਿੰਟ"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s ਸਕਿੰਟ"
-msgstr[1] "%s ਸਕਿੰਟ"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s ਸਕਿੰਟ"
+msgstr[1] "%(n)s ਸਕਿੰਟ"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/hi.po
===================================================================
--- po/hi.po	(revision 6108)
+++ po/hi.po	(working copy)
@@ -5919,8 +5919,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "अगला पजल"
 msgstr[1] "अगला पजल"
 
@@ -5939,8 +5939,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "पैनांट पजल"
 msgstr[1] "पैनांट पजल"
 
@@ -5978,50 +5978,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d अंक"
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "मेरा दूसरा दिन"
 msgstr[1] "मेरा दूसरा दिन"
 
Index: po/zh_CN.po
===================================================================
--- po/zh_CN.po	(revision 6108)
+++ po/zh_CN.po	(working copy)
@@ -5707,8 +5707,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "下一迷宫"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:181
@@ -5725,8 +5725,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/sudoku.py:599
@@ -5763,44 +5763,44 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d 分"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "我的第二天"
 
 #. Translators... this is a messay way of concatenating
Index: po/ne.po
===================================================================
--- po/ne.po	(revision 6108)
+++ po/ne.po	(working copy)
@@ -5824,8 +5824,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "अर्को पजल"
 msgstr[1] "अर्को पजल"
 
@@ -5844,8 +5844,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "पिनान्ट पजल"
 msgstr[1] "पिनान्ट पजल"
 
@@ -5884,50 +5884,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d अंक"
 msgstr[1] "%d अंकहरु"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "मेरो दोश्रो दिन"
 msgstr[1] "मेरो दोश्रो दिन"
 
Index: po/ta.po
===================================================================
--- po/ta.po	(revision 6108)
+++ po/ta.po	(working copy)
@@ -5708,8 +5708,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "அடுத்த புதிர்"
 msgstr[1] "அடுத்த புதிர்"
 
@@ -5728,8 +5728,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "கப்பல் கொடி புதிர்"
 msgstr[1] "கப்பல் கொடி புதிர்"
 
@@ -5767,50 +5767,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d புள்ளி"
 msgstr[1] "%d  புள்ளிகள்"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "என்னுடைய இரண்டாம் நாள்"
 msgstr[1] "என்னுடைய இரண்டாம் நாள்"
 
Index: po/wa.po
===================================================================
--- po/wa.po	(revision 6108)
+++ po/wa.po	(working copy)
@@ -5700,8 +5700,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5720,8 +5720,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5760,50 +5760,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Mi deujhinme djoû"
 msgstr[1] "Mi deujhinme djoû"
 
Index: po/eu.po
===================================================================
--- po/eu.po	(revision 6108)
+++ po/eu.po	(working copy)
@@ -5988,8 +5988,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Hurrengo puzzlea"
 msgstr[1] "Hurrengo puzzlea"
 
@@ -6008,8 +6008,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Banderatxo puzzlea"
 msgstr[1] "Banderatxo puzzlea"
 
@@ -6047,50 +6047,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "Puntu %d"
 msgstr[1] "%d puntu"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Bigarren eguna"
 msgstr[1] "Bigarren eguna"
 
Index: po/en_GB.po
===================================================================
--- po/en_GB.po	(revision 6108)
+++ po/en_GB.po	(working copy)
@@ -5916,10 +5916,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s puzzle"
-msgstr[1] "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s puzzle"
+msgstr[1] "%(n)s puzzles"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5935,10 +5935,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Generated %s puzzle"
-msgstr[1] "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Generated %(n)s puzzle"
+msgstr[1] "Generated %(n)s puzzles"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5969,52 +5969,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s year"
-msgstr[1] "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s year"
+msgstr[1] "%(n)s years"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s month"
-msgstr[1] "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s month"
+msgstr[1] "%(n)s months"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s week"
-msgstr[1] "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s week"
+msgstr[1] "%(n)s weeks"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s day"
-msgstr[1] "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s day"
+msgstr[1] "%(n)s days"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s hour"
-msgstr[1] "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s hour"
+msgstr[1] "%(n)s hours"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minute"
-msgstr[1] "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minute"
+msgstr[1] "%(n)s minutes"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s second"
-msgstr[1] "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s second"
+msgstr[1] "%(n)s seconds"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/cy.po
===================================================================
--- po/cy.po	(revision 6108)
+++ po/cy.po	(working copy)
@@ -5831,11 +5831,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s pos"
-msgstr[1] "%s pos"
-msgstr[2] "%s bos"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s pos"
+msgstr[1] "%(n)s pos"
+msgstr[2] "%(n)s bos"
 msgstr[3] "Pos _Nesaf"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
@@ -5854,12 +5854,12 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Wedi creu %s pos"
-msgstr[1] "Wedi creu %s pos"
-msgstr[2] "Wedi creu %s bos"
-msgstr[3] "Wedi creu %s pos"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Wedi creu %(n)s pos"
+msgstr[1] "Wedi creu %(n)s pos"
+msgstr[2] "Wedi creu %(n)s bos"
+msgstr[3] "Wedi creu %(n)s pos"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -5894,66 +5894,66 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s blynedd"
-msgstr[1] "%s mlynedd"
-msgstr[2] "%s flynedd"
-msgstr[3] "%s mlynedd"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s blynedd"
+msgstr[1] "%(n)s mlynedd"
+msgstr[2] "%(n)s flynedd"
+msgstr[3] "%(n)s mlynedd"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s mis"
-msgstr[1] "%s fis"
-msgstr[2] "%s fis"
-msgstr[3] "%s mis"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s mis"
+msgstr[1] "%(n)s fis"
+msgstr[2] "%(n)s fis"
+msgstr[3] "%(n)s mis"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s wythnos"
-msgstr[1] "%s wythnos"
-msgstr[2] "%s wythnos"
-msgstr[3] "%s wythnos"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s wythnos"
+msgstr[1] "%(n)s wythnos"
+msgstr[2] "%(n)s wythnos"
+msgstr[3] "%(n)s wythnos"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s dydd"
-msgstr[1] "%s dydd"
-msgstr[2] "%s ddydd"
-msgstr[3] "%s dydd"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s dydd"
+msgstr[1] "%(n)s dydd"
+msgstr[2] "%(n)s ddydd"
+msgstr[3] "%(n)s dydd"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s awr"
-msgstr[1] "%s awr"
-msgstr[2] "%s awr"
-msgstr[3] "%s awr"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s awr"
+msgstr[1] "%(n)s awr"
+msgstr[2] "%(n)s awr"
+msgstr[3] "%(n)s awr"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s munud"
-msgstr[1] "%s funud"
-msgstr[2] "%s funud"
-msgstr[3] "%s munud"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s munud"
+msgstr[1] "%(n)s funud"
+msgstr[2] "%(n)s funud"
+msgstr[3] "%(n)s munud"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s eiliad"
-msgstr[1] "%s eiliad"
-msgstr[2] "%s eiliad"
-msgstr[3] "%s eiliad"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s eiliad"
+msgstr[1] "%(n)s eiliad"
+msgstr[2] "%(n)s eiliad"
+msgstr[3] "%(n)s eiliad"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/gu.po
===================================================================
--- po/gu.po	(revision 6108)
+++ po/gu.po	(working copy)
@@ -5953,10 +5953,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s કોયડો"
-msgstr[1] "%s કોયડાઓ"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s કોયડો"
+msgstr[1] "%(n)s કોયડાઓ"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5972,10 +5972,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "બનાવેલ %s કોયડો"
-msgstr[1] "બનાવેલ %s કોયડાઓ"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "બનાવેલ %(n)s કોયડો"
+msgstr[1] "બનાવેલ %(n)s કોયડાઓ"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -6006,52 +6006,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s વર્ષ"
-msgstr[1] "%s વર્ષો"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s વર્ષ"
+msgstr[1] "%(n)s વર્ષો"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s મહિનો"
-msgstr[1] "%s મહિનાઓ"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s મહિનો"
+msgstr[1] "%(n)s મહિનાઓ"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s અઠવાડિયું"
-msgstr[1] "%s અઠવાડિયાઓ"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s અઠવાડિયું"
+msgstr[1] "%(n)s અઠવાડિયાઓ"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s દિવસ"
-msgstr[1] "%s દિવસો"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s દિવસ"
+msgstr[1] "%(n)s દિવસો"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s કલાક"
-msgstr[1] "%s કલાકો"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s કલાક"
+msgstr[1] "%(n)s કલાકો"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s મિનિટ"
-msgstr[1] "%s મિનિટો"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s મિનિટ"
+msgstr[1] "%(n)s મિનિટો"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s સેકન્ડ"
-msgstr[1] "%s સેકન્ડો"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s સેકન્ડ"
+msgstr[1] "%(n)s સેકન્ડો"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/hu.po
===================================================================
--- po/hu.po	(revision 6108)
+++ po/hu.po	(working copy)
@@ -5769,10 +5769,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s kirakó"
-msgstr[1] "%s kirakó"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s kirakó"
+msgstr[1] "%(n)s kirakó"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5788,10 +5788,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Előállítva %s kirakó"
-msgstr[1] "Előállítva %s kirakó"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Előállítva %(n)s kirakó"
+msgstr[1] "Előállítva %(n)s kirakó"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5822,52 +5822,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s év"
-msgstr[1] "%s év"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s év"
+msgstr[1] "%(n)s év"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s hónap"
-msgstr[1] "%s hónap"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s hónap"
+msgstr[1] "%(n)s hónap"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s hét"
-msgstr[1] "%s hét"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s hét"
+msgstr[1] "%(n)s hét"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s nap"
-msgstr[1] "%s nap"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s nap"
+msgstr[1] "%(n)s nap"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s óra"
-msgstr[1] "%s óra"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s óra"
+msgstr[1] "%(n)s óra"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s perc"
-msgstr[1] "%s perc"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s perc"
+msgstr[1] "%(n)s perc"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s másodperc"
-msgstr[1] "%s másodperc"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s másodperc"
+msgstr[1] "%(n)s másodperc"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/vi.po
===================================================================
--- po/vi.po	(revision 6108)
+++ po/vi.po	(working copy)
@@ -5763,9 +5763,9 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s câu đố"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s câu đố"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5780,9 +5780,9 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Đã tạo ra %s câu đố"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Đã tạo ra %(n)s câu đố"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5813,45 +5813,45 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s năm"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s năm"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s tháng"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s tháng"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s tuần"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s tuần"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s ngày"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s ngày"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s giờ"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s giờ"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s phút"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s phút"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s giây"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s giây"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/ku.po
===================================================================
--- po/ku.po	(revision 6108)
+++ po/ku.po	(working copy)
@@ -5545,8 +5545,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5564,8 +5564,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5602,50 +5602,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s sal"
-msgstr[1] "%s sal"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s sal"
+msgstr[1] "%(n)s sal"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s meh"
-msgstr[1] "%s meh"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s meh"
+msgstr[1] "%(n)s meh"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s hefte"
-msgstr[1] "%s hefte"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s hefte"
+msgstr[1] "%(n)s hefte"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] "% roj"
 msgstr[1] "% roj"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s saet"
-msgstr[1] "%s saet"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s saet"
+msgstr[1] "%(n)s saet"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
Index: po/sq.po
===================================================================
--- po/sq.po	(revision 6108)
+++ po/sq.po	(working copy)
@@ -5721,8 +5721,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Gjëegjëza Tjetër"
 msgstr[1] "Gjëegjëza Tjetër"
 
@@ -5741,8 +5741,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Gjëegjëza Pennant"
 msgstr[1] "Gjëegjëza Pennant"
 
@@ -5780,50 +5780,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d pikë"
 msgstr[1] "%d pikë"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Dita ime e dytë"
 msgstr[1] "Dita ime e dytë"
 
Index: po/ru.po
===================================================================
--- po/ru.po	(revision 6108)
+++ po/ru.po	(working copy)
@@ -5807,11 +5807,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s головоломка"
-msgstr[1] "%s головоломки"
-msgstr[2] "%s головоломок"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s головоломка"
+msgstr[1] "%(n)s головоломки"
+msgstr[2] "%(n)s головоломок"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5828,11 +5828,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Создана %s головоломка"
-msgstr[1] "Создано %s головоломки"
-msgstr[2] "Создано %s головоломок"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Создана %(n)s головоломка"
+msgstr[1] "Создано %(n)s головоломки"
+msgstr[2] "Создано %(n)s головоломок"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5863,59 +5863,59 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s год"
-msgstr[1] "%s года"
-msgstr[2] "%s лет"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s год"
+msgstr[1] "%(n)s года"
+msgstr[2] "%(n)s лет"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s месяц"
-msgstr[1] "%s месяца"
-msgstr[2] "%s месяцев"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s месяц"
+msgstr[1] "%(n)s месяца"
+msgstr[2] "%(n)s месяцев"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s неделя"
-msgstr[1] "%s недели"
-msgstr[2] "%s недель"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s неделя"
+msgstr[1] "%(n)s недели"
+msgstr[2] "%(n)s недель"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s день"
-msgstr[1] "%s дня"
-msgstr[2] "%s дней"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s день"
+msgstr[1] "%(n)s дня"
+msgstr[2] "%(n)s дней"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s час"
-msgstr[1] "%s часа"
-msgstr[2] "%s часов"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s час"
+msgstr[1] "%(n)s часа"
+msgstr[2] "%(n)s часов"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s минута"
-msgstr[1] "%s минуты"
-msgstr[2] "%s минут"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s минута"
+msgstr[1] "%(n)s минуты"
+msgstr[2] "%(n)s минут"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s секунда"
-msgstr[1] "%s секунды"
-msgstr[2] "%s секунд"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s секунда"
+msgstr[1] "%(n)s секунды"
+msgstr[2] "%(n)s секунд"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/id.po
===================================================================
--- po/id.po	(revision 6108)
+++ po/id.po	(working copy)
@@ -5726,8 +5726,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Puzzle Selanjutnya"
 msgstr[1] "Puzzle Selanjutnya"
 
@@ -5746,8 +5746,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Panji Puzzle"
 msgstr[1] "Panji Puzzle"
 
@@ -5785,50 +5785,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d poin"
 msgstr[1] "%d poin"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Hari kedua"
 msgstr[1] "Hari kedua"
 
Index: po/el.po
===================================================================
--- po/el.po	(revision 6108)
+++ po/el.po	(working copy)
@@ -5754,8 +5754,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Επόμενο παζλ"
 msgstr[1] "Επόμενο παζλ"
 
@@ -5774,8 +5774,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Pennant Puzzle"
 msgstr[1] "Pennant Puzzle"
 
@@ -5813,50 +5813,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d πόντος"
 msgstr[1] "%d πόντοι"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Δεύτερη μέρα"
 msgstr[1] "Δεύτερη μέρα"
 
Index: po/en_CA.po
===================================================================
--- po/en_CA.po	(revision 6108)
+++ po/en_CA.po	(working copy)
@@ -5737,8 +5737,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Next Puzzle"
 msgstr[1] "Next Puzzle"
 
@@ -5757,8 +5757,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Pennant Puzzle"
 msgstr[1] "Pennant Puzzle"
 
@@ -5796,50 +5796,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d point"
 msgstr[1] "%d points"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "My second day"
 msgstr[1] "My second day"
 
Index: po/ml.po
===================================================================
--- po/ml.po	(revision 6108)
+++ po/ml.po	(working copy)
@@ -5726,8 +5726,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5745,8 +5745,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5779,50 +5779,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
Index: po/et.po
===================================================================
--- po/et.po	(revision 6108)
+++ po/et.po	(working copy)
@@ -5698,10 +5698,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s mõistatus"
-msgstr[1] "%s mõistatust"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s mõistatus"
+msgstr[1] "%(n)s mõistatust"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5717,8 +5717,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5751,52 +5751,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s aasta"
-msgstr[1] "%s aastat"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s aasta"
+msgstr[1] "%(n)s aastat"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s kuu"
-msgstr[1] "%s kuud"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s kuu"
+msgstr[1] "%(n)s kuud"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s nädal"
-msgstr[1] "%s nädalat"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s nädal"
+msgstr[1] "%(n)s nädalat"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s päev"
-msgstr[1] "%s päeva"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s päev"
+msgstr[1] "%(n)s päeva"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s tund"
-msgstr[1] "%s tundi"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s tund"
+msgstr[1] "%(n)s tundi"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minut"
-msgstr[1] "%s minutit"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minut"
+msgstr[1] "%(n)s minutit"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s sekund"
-msgstr[1] "%s sekundit"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s sekund"
+msgstr[1] "%(n)s sekundit"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/nl.po
===================================================================
--- po/nl.po	(revision 6108)
+++ po/nl.po	(working copy)
@@ -5931,10 +5931,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s puzzel"
-msgstr[1] "%s puzzels"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s puzzel"
+msgstr[1] "%(n)s puzzels"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5950,10 +5950,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "%s puzzel gemaakt"
-msgstr[1] "%s puzzels gemaakt"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "%(n)s puzzel gemaakt"
+msgstr[1] "%(n)s puzzels gemaakt"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5984,52 +5984,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s jaar"
-msgstr[1] "%s jaar"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s jaar"
+msgstr[1] "%(n)s jaar"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s maand"
-msgstr[1] "%s maanden"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s maand"
+msgstr[1] "%(n)s maanden"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s week"
-msgstr[1] "%s weken"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s week"
+msgstr[1] "%(n)s weken"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s dag"
-msgstr[1] "%s dagen"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s dag"
+msgstr[1] "%(n)s dagen"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s uur"
-msgstr[1] "%s uur"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s uur"
+msgstr[1] "%(n)s uur"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minuut"
-msgstr[1] "%s minuten"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minuut"
+msgstr[1] "%(n)s minuten"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s seconde"
-msgstr[1] "%s seconden"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s seconde"
+msgstr[1] "%(n)s seconden"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/pl.po
===================================================================
--- po/pl.po	(revision 6108)
+++ po/pl.po	(working copy)
@@ -5936,8 +5936,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Następne puzzle"
 msgstr[1] "Następne puzzle"
 msgstr[2] "Następne puzzle"
@@ -5958,8 +5958,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Puzzle proporcowe"
 msgstr[1] "Puzzle proporcowe"
 msgstr[2] "Puzzle proporcowe"
@@ -5995,56 +5995,56 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s rok"
-msgstr[1] "%s lata"
-msgstr[2] "%s lat"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s rok"
+msgstr[1] "%(n)s lata"
+msgstr[2] "%(n)s lat"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d punkt"
 msgstr[1] "%d punkty"
 msgstr[2] "%d punktów"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s tydzień"
-msgstr[1] "%s tygodnie"
-msgstr[2] "%s tygodni"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s tydzień"
+msgstr[1] "%(n)s tygodnie"
+msgstr[2] "%(n)s tygodni"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s dzień"
-msgstr[1] "%s dni"
-msgstr[2] "%s dni"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s dzień"
+msgstr[1] "%(n)s dni"
+msgstr[2] "%(n)s dni"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s godzina"
-msgstr[1] "%s godziny"
-msgstr[2] "%s godzin"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s godzina"
+msgstr[1] "%(n)s godziny"
+msgstr[2] "%(n)s godzin"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minuta"
-msgstr[1] "%s minuty"
-msgstr[2] "%s minut"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minuta"
+msgstr[1] "%(n)s minuty"
+msgstr[2] "%(n)s minut"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Mój drugi dzień"
 msgstr[1] "Mój drugi dzień"
 msgstr[2] "Mój drugi dzień"
Index: po/th.po
===================================================================
--- po/th.po	(revision 6108)
+++ po/th.po	(working copy)
@@ -5707,9 +5707,9 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "ปริศนา %s"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "ปริศนา %(n)s"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5724,9 +5724,9 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "สร้างปริศนาไปแล้ว %s ปริศนา"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "สร้างปริศนาไปแล้ว %(n)s ปริศนา"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5757,45 +5757,45 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s ปี"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s ปี"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s เดือน"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s เดือน"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s สัปดาห์"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s สัปดาห์"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s วัน"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s วัน"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s ชั่วโมง"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s ชั่วโมง"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s นาที"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s นาที"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s วินาที"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s วินาที"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/it.po
===================================================================
--- po/it.po	(revision 6108)
+++ po/it.po	(working copy)
@@ -5796,10 +5796,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s schema"
-msgstr[1] "%s schemi"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s schema"
+msgstr[1] "%(n)s schemi"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:181
 #, fuzzy
@@ -5816,8 +5816,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Puzzle pennone"
 msgstr[1] "Puzzle pennone"
 
@@ -5854,52 +5854,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s anno"
-msgstr[1] "%s anni"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s anno"
+msgstr[1] "%(n)s anni"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s mese"
-msgstr[1] "%s mesi"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s mese"
+msgstr[1] "%(n)s mesi"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s settimana"
-msgstr[1] "%s settimane"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s settimana"
+msgstr[1] "%(n)s settimane"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s giorno"
-msgstr[1] "%s giorni"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s giorno"
+msgstr[1] "%(n)s giorni"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s ora"
-msgstr[1] "%s ore"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s ora"
+msgstr[1] "%(n)s ore"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minuto"
-msgstr[1] "%s minuti"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minuto"
+msgstr[1] "%(n)s minuti"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s secondo"
-msgstr[1] "%s secondi"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s secondo"
+msgstr[1] "%(n)s secondi"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/sl.po
===================================================================
--- po/sl.po	(revision 6108)
+++ po/sl.po	(working copy)
@@ -5745,8 +5745,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Naslednja sestavljanka"
 msgstr[1] "Naslednja sestavljanka"
 msgstr[2] "Naslednja sestavljanka"
@@ -5769,8 +5769,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Sestavljanka zastavica"
 msgstr[1] "Sestavljanka zastavica"
 msgstr[2] "Sestavljanka zastavica"
@@ -5810,8 +5810,8 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5819,8 +5819,8 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "%d točka"
 msgstr[1] "%d točki"
 msgstr[2] "%d točke"
@@ -5828,8 +5828,8 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5837,8 +5837,8 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5846,8 +5846,8 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5855,8 +5855,8 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5864,8 +5864,8 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Moj drugi dan"
 msgstr[1] "Moj drugi dan"
 msgstr[2] "Moj drugi dan"
Index: po/lt.po
===================================================================
--- po/lt.po	(revision 6108)
+++ po/lt.po	(working copy)
@@ -5791,11 +5791,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s galvosūkis"
-msgstr[1] "%s galvosūkiai"
-msgstr[2] "%s galvosūkių"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s galvosūkis"
+msgstr[1] "%(n)s galvosūkiai"
+msgstr[2] "%(n)s galvosūkių"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5812,11 +5812,11 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Sugeneruota %s dėlionė"
-msgstr[1] "Sugeneruotos %s dėlionės"
-msgstr[2] "Sugeneruota %s dėlionių"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Sugeneruota %(n)s dėlionė"
+msgstr[1] "Sugeneruotos %(n)s dėlionės"
+msgstr[2] "Sugeneruota %(n)s dėlionių"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -5847,59 +5847,59 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s metai"
-msgstr[1] "%s metai"
-msgstr[2] "%s metų"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s metai"
+msgstr[1] "%(n)s metai"
+msgstr[2] "%(n)s metų"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s mėnuo"
-msgstr[1] "%s mėnesiai"
-msgstr[2] "%s mėnesių"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s mėnuo"
+msgstr[1] "%(n)s mėnesiai"
+msgstr[2] "%(n)s mėnesių"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s savaitė"
-msgstr[1] "%s savaitės"
-msgstr[2] "%s savaičių"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s savaitė"
+msgstr[1] "%(n)s savaitės"
+msgstr[2] "%(n)s savaičių"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s diena"
-msgstr[1] "%s dienos"
-msgstr[2] "%s dienų"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s diena"
+msgstr[1] "%(n)s dienos"
+msgstr[2] "%(n)s dienų"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s valanda"
-msgstr[1] "%s valandos"
-msgstr[2] "%s valandų"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s valanda"
+msgstr[1] "%(n)s valandos"
+msgstr[2] "%(n)s valandų"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minutė"
-msgstr[1] "%s minutės"
-msgstr[2] "%s minučių"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minutė"
+msgstr[1] "%(n)s minutės"
+msgstr[2] "%(n)s minučių"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s sekundė"
-msgstr[1] "%s sekundės"
-msgstr[2] "%s sekundžių"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s sekundė"
+msgstr[1] "%(n)s sekundės"
+msgstr[2] "%(n)s sekundžių"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/xh.po
===================================================================
--- po/xh.po	(revision 6108)
+++ po/xh.po	(working copy)
@@ -5889,8 +5889,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:137
 #, fuzzy, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
 msgstr[0] "Iphazili Elandelayo"
 msgstr[1] "Iphazili Elandelayo"
 
@@ -5909,8 +5909,8 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, fuzzy, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "I-Pennant Puzzle"
 msgstr[1] "I-Pennant Puzzle"
 
@@ -5949,50 +5949,50 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, fuzzy, python-format
-msgid "%s month"
-msgid_plural "%s months"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
 msgstr[0] "ipoyinti %d"
 msgstr[1] "iipoyinti %d"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, fuzzy, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
 msgstr[0] "Usuku lwam lwesibini"
 msgstr[1] "Usuku lwam lwesibini"
 
Index: po/pt.po
===================================================================
--- po/pt.po	(revision 6108)
+++ po/pt.po	(working copy)
@@ -5807,10 +5807,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "Puzzle %s"
-msgstr[1] "Puzzles %s"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "Puzzle %(n)s"
+msgstr[1] "Puzzles %(n)s"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5826,10 +5826,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Gerado %s puzzle"
-msgstr[1] "Gerados %s puzzles"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Gerado %(n)s puzzle"
+msgstr[1] "Gerados %(n)s puzzles"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:598
 msgid "Very Hard"
@@ -5860,52 +5860,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s ano"
-msgstr[1] "%s anos"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s ano"
+msgstr[1] "%(n)s anos"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s mês"
-msgstr[1] "%s meses"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s mês"
+msgstr[1] "%(n)s meses"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s semana"
-msgstr[1] "%s semanas"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s semana"
+msgstr[1] "%(n)s semanas"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s dia"
-msgstr[1] "%s dias"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s dia"
+msgstr[1] "%(n)s dias"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s hora"
-msgstr[1] "%s horas"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s hora"
+msgstr[1] "%(n)s horas"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s minuto"
-msgstr[1] "%s minutos"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s minuto"
+msgstr[1] "%(n)s minutos"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s segundo"
-msgstr[1] "%s segundos"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s segundo"
+msgstr[1] "%(n)s segundos"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
Index: po/bg.po
===================================================================
--- po/bg.po	(revision 6108)
+++ po/bg.po	(working copy)
@@ -5791,10 +5791,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
 #, python-format
-msgid "%s puzzle"
-msgid_plural "%s puzzles"
-msgstr[0] "%s главоблъсканица"
-msgstr[1] "%s главоблъсканици"
+msgid "%(n)s puzzle"
+msgid_plural "%(n)s puzzles"
+msgstr[0] "%(n)s главоблъсканица"
+msgstr[1] "%(n)s главоблъсканици"
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:208
 msgid "Stopped"
@@ -5810,10 +5810,10 @@
 
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
 #, python-format
-msgid "Generated %s puzzle"
-msgid_plural "Generated %s puzzles"
-msgstr[0] "Генерирана %s главоблъсканица"
-msgstr[1] "Генерирани %s главоблъсканици"
+msgid "Generated %(n)s puzzle"
+msgid_plural "Generated %(n)s puzzles"
+msgstr[0] "Генерирана %(n)s главоблъсканица"
+msgstr[1] "Генерирани %(n)s главоблъсканици"
 
 #: ../gnome-sudoku/src/lib/sudoku.py:612
 msgid "Very Hard"
@@ -5844,52 +5844,52 @@
 
 #: ../gnome-sudoku/src/lib/timer.py:12
 #, python-format
-msgid "%s year"
-msgid_plural "%s years"
-msgstr[0] "%s година"
-msgstr[1] "%s години"
+msgid "%(n)s year"
+msgid_plural "%(n)s years"
+msgstr[0] "%(n)s година"
+msgstr[1] "%(n)s години"
 
 #: ../gnome-sudoku/src/lib/timer.py:14
 #, python-format
-msgid "%s month"
-msgid_plural "%s months"
-msgstr[0] "%s месец"
-msgstr[1] "%s месеца"
+msgid "%(n)s month"
+msgid_plural "%(n)s months"
+msgstr[0] "%(n)s месец"
+msgstr[1] "%(n)s месеца"
 
 #: ../gnome-sudoku/src/lib/timer.py:16
 #, python-format
-msgid "%s week"
-msgid_plural "%s weeks"
-msgstr[0] "%s седмица"
-msgstr[1] "%s седмици"
+msgid "%(n)s week"
+msgid_plural "%(n)s weeks"
+msgstr[0] "%(n)s седмица"
+msgstr[1] "%(n)s седмици"
 
 #: ../gnome-sudoku/src/lib/timer.py:18
 #, python-format
-msgid "%s day"
-msgid_plural "%s days"
-msgstr[0] "%s ден"
-msgstr[1] "%s дена"
+msgid "%(n)s day"
+msgid_plural "%(n)s days"
+msgstr[0] "%(n)s ден"
+msgstr[1] "%(n)s дена"
 
 #: ../gnome-sudoku/src/lib/timer.py:20
 #, python-format
-msgid "%s hour"
-msgid_plural "%s hours"
-msgstr[0] "%s час"
-msgstr[1] "%s часа"
+msgid "%(n)s hour"
+msgid_plural "%(n)s hours"
+msgstr[0] "%(n)s час"
+msgstr[1] "%(n)s часа"
 
 #: ../gnome-sudoku/src/lib/timer.py:22
 #, python-format
-msgid "%s minute"
-msgid_plural "%s minutes"
-msgstr[0] "%s минута"
-msgstr[1] "%s минути"
+msgid "%(n)s minute"
+msgid_plural "%(n)s minutes"
+msgstr[0] "%(n)s минута"
+msgstr[1] "%(n)s минути"
 
 #: ../gnome-sudoku/src/lib/timer.py:24
 #, python-format
-msgid "%s second"
-msgid_plural "%s seconds"
-msgstr[0] "%s секунда"
-msgstr[1] "%s секунди"
+msgid "%(n)s second"
+msgid_plural "%(n)s seconds"
+msgstr[0] "%(n)s секунда"
+msgstr[1] "%(n)s секунди"
 
 #. Translators... this is a messay way of concatenating
 #. lists. In English we do lists this way: 1, 2, 3, 4, 5
