From c133d973aa4b01d6325c78705472848c896f6549 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@gmail.com>
Date: Wed, 1 May 2013 05:53:20 +0000
Subject: [PATCH] Revert "Fix typo."

This reverts commit 390af5d0496545bb6dcca3601edfe07d95c6bde1.

Conflicts:
	locales/fr.po
---
 locales/de.po    | 2 +-
 locales/fi.po    | 2 +-
 locales/fr.po    | 4 ++--
 locales/it.po    | 2 +-
 src/callbacks.py | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/locales/de.po b/locales/de.po
index 4777563c9..a2b751c57 100644
--- a/locales/de.po
+++ b/locales/de.po
@@ -59,7 +59,7 @@ msgid "(XX more messages)"
 msgstr "(XX mehr Nachrichten)"
 
 #: ../src/callbacks.py:908
-msgid "1 more message"
+msgid "more message"
 msgstr "mehr Nachrichten"
 
 #: ../src/callbacks.py:910
diff --git a/locales/fi.po b/locales/fi.po
index 0568bfd02..0dfc9326a 100644
--- a/locales/fi.po
+++ b/locales/fi.po
@@ -85,7 +85,7 @@ msgid "(XX more messages)"
 msgstr "(XX viestiä jatkoa)"
 
 #: src/callbacks.py:909
-msgid "1 more message"
+msgid "more message"
 msgstr "viesti jatkoa"
 
 #: src/callbacks.py:911
diff --git a/locales/fr.po b/locales/fr.po
index da211263f..99adc6e17 100644
--- a/locales/fr.po
+++ b/locales/fr.po
@@ -84,8 +84,8 @@ msgid "(XX more messages)"
 msgstr "(XX messages supplémentaires)"
 
 #: src/callbacks.py:958
-msgid "1 more message"
-msgstr "1 message supplémentaire"
+msgid "more message"
+msgstr "message supplémentaire"
 
 #: src/callbacks.py:960
 msgid "more messages"
diff --git a/locales/it.po b/locales/it.po
index d0cd71e20..c4e5eb139 100644
--- a/locales/it.po
+++ b/locales/it.po
@@ -56,7 +56,7 @@ msgid "(XX more messages)"
 msgstr "(XX altri messaggi)"
 
 #: src/callbacks.py:914
-msgid "1 more message"
+msgid "more message"
 msgstr "altro messaggio"
 
 #: src/callbacks.py:916
diff --git a/src/callbacks.py b/src/callbacks.py
index 96a340825..5528079d0 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -955,7 +955,7 @@ class NestedCommandsIrcProxy(ReplyIrcProxy):
                     response = msgs.pop()
                     if msgs:
                         if len(msgs) == 1:
-                            more = _('1 more message')
+                            more = _('more message')
                         else:
                             more = _('more messages')
                         n = ircutils.bold('(%i %s)' % (len(msgs), more))