Package: lostirc
Version: 0.4.6-2
Severity: minor
Tags: patch
Just a minor spelling correction.
This change contains a change to po/Makefile.in.in: this is required else the
correction would cause "can't represent changes to binary file" errors due to
the changed .gmo files.
--
| Darren Salt | linux or ds at | nr. Ashington, | Toon
| RISC OS, Linux | youmustbejoking,demon,co,uk | Northumberland | Army
| + Use more efficient products. Use less. BE MORE ENERGY EFFICIENT.
Like winter snow on summer lawn, time past is time gone.
--- lostirc-0.4.6.orig/po/Makefile.in.in
+++ lostirc-0.4.6/po/Makefile.in.in
@@ -270,8 +270,8 @@
mostlyclean:
rm -f remove-potcdate.sed
- rm -f stamp-poT
- rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+ rm -f stamp-po
+ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
*.gmo
rm -fr *.o
clean: mostlyclean
--- lostirc-0.4.6.orig/po/lostirc.pot
+++ lostirc-0.4.6/po/lostirc.pot
@@ -87,7 +87,7 @@
#: src/gtkmm/MainWindow.cpp:310
msgid ""
-"Locale conversion error. An error occured while converting text from UTF-8 "
+"Locale conversion error. An error occurred while converting text from UTF-8 "
"to your current locale.\n"
"\n"
"This is most likely because your locale is set to a value which doesn't "
@@ -105,7 +105,7 @@
#: src/gtkmm/MainWindow.cpp:318
msgid ""
-"Encoding conversion error. An error occured while converting text from UTF-8 "
+"Encoding conversion error. An error occurred while converting text from UTF-8
"
"to the user-defined encoding.\n"
"\n"
"This is most likely because the encoding you have chosen doesn't support the "
@@ -536,11 +536,11 @@
msgstr ""
#: src/libirc/Socket.cpp:327
-msgid "An error occured while reading from pipe (Internal error 2)"
+msgid "An error occurred while reading from pipe (Internal error 2)"
msgstr ""
#: src/libirc/Socket.cpp:337
-msgid "An error occured while reading from pipe (Internal error 3)"
+msgid "An error occurred while reading from pipe (Internal error 3)"
msgstr ""
#: src/libirc/Parser.cpp:876
--- lostirc-0.4.6.orig/po/da.po
+++ lostirc-0.4.6/po/da.po
@@ -111,7 +111,7 @@
#: src/gtkmm/MainWindow.cpp:310
msgid ""
-"Locale conversion error. An error occured while converting text from UTF-8 "
+"Locale conversion error. An error occurred while converting text from UTF-8 "
"to your current locale.\n"
"\n"
"This is most likely because your locale is set to a value which doesn't "
@@ -139,7 +139,7 @@
#: src/gtkmm/MainWindow.cpp:318
msgid ""
-"Encoding conversion error. An error occured while converting text from UTF-8 "
+"Encoding conversion error. An error occurred while converting text from UTF-8
"
"to the user-defined encoding.\n"
"\n"
"This is most likely because the encoding you have chosen doesn't support the "
@@ -604,11 +604,11 @@
msgstr "Fejl ved skrivning til rør: "
#: src/libirc/Socket.cpp:327
-msgid "An error occured while reading from pipe (Internal error 2)"
+msgid "An error occurred while reading from pipe (Internal error 2)"
msgstr "En fejl opstod, ved at læse fra rør (Intern fejl 2)"
#: src/libirc/Socket.cpp:337
-msgid "An error occured while reading from pipe (Internal error 3)"
+msgid "An error occurred while reading from pipe (Internal error 3)"
msgstr "En fejl opstod, ved at læse fra rør (Intern fejl 3)"
#: src/libirc/Parser.cpp:876
--- lostirc-0.4.6.orig/po/fr.po
+++ lostirc-0.4.6/po/fr.po
@@ -114,7 +114,7 @@
#: src/gtkmm/MainWindow.cpp:310
msgid ""
-"Locale conversion error. An error occured while converting text from UTF-8 "
+"Locale conversion error. An error occurred while converting text from UTF-8 "
"to your current locale.\n"
"\n"
"This is most likely because your locale is set to a value which doesn't "
@@ -143,7 +143,7 @@
#: src/gtkmm/MainWindow.cpp:318
msgid ""
-"Encoding conversion error. An error occured while converting text from UTF-8 "
+"Encoding conversion error. An error occurred while converting text from UTF-8
"
"to the user-defined encoding.\n"
"\n"
"This is most likely because the encoding you have chosen doesn't support the "
@@ -617,12 +617,12 @@
msgstr "Erreur d'écriture dans le pipe: "
#: src/libirc/Socket.cpp:327
-msgid "An error occured while reading from pipe (Internal error 2)"
+msgid "An error occurred while reading from pipe (Internal error 2)"
msgstr ""
"Une erreur est survenur lors de la lecture sur le pipe (Erreur interne 2)"
#: src/libirc/Socket.cpp:337
-msgid "An error occured while reading from pipe (Internal error 3)"
+msgid "An error occurred while reading from pipe (Internal error 3)"
msgstr ""
#: src/libirc/Parser.cpp:876
--- lostirc-0.4.6.orig/src/libirc/Socket.cpp
+++ lostirc-0.4.6/src/libirc/Socket.cpp
@@ -324,7 +324,7 @@
if (new_retval != -1) {
bytes_read += new_retval;
if (bytes_read != size_to_be_read) {
- on_error(_("An error occured while reading from pipe (Internal
error 2)"));
+ on_error(_("An error occurred while reading from pipe
(Internal error 2)"));
} else {
// copy the struct we received into the sockaddr member
memcpy(static_cast<void*>(&sockaddr.sin_addr),
@@ -334,7 +334,7 @@
on_host_resolved();
}
} else {
- on_error(_("An error occured while reading from pipe (Internal
error 3)"));
+ on_error(_("An error occurred while reading from pipe (Internal
error 3)"));
}
} else {
--- lostirc-0.4.6.orig/src/gtkmm/MainWindow.cpp
+++ lostirc-0.4.6/src/gtkmm/MainWindow.cpp
@@ -307,7 +307,7 @@
{
Glib::ustring msg;
if (!tried_custom_encoding) {
- msg = _("Locale conversion error. An error occured while converting
text from UTF-8 to your current locale.\n\nThis is most likely because your
locale is set to a value which doesn't support the character(s) converting
to.\n\nIf you believe this is a bug, please report it to the application
author.");
+ msg = _("Locale conversion error. An error occurred while converting
text from UTF-8 to your current locale.\n\nThis is most likely because your
locale is set to a value which doesn't support the character(s) converting
to.\n\nIf you believe this is a bug, please report it to the application
author.");
char *locale = std::getenv("LANG");
if (locale != NULL) {
@@ -315,7 +315,7 @@
msg += locale;
}
} else {
- msg = _("Encoding conversion error. An error occured while converting
text from UTF-8 to the user-defined encoding.\n\nThis is most likely because
the encoding you have chosen doesn't support the character(s) converting
to.\n\nIf you believe this is a bug, please report it to the application
author.");
+ msg = _("Encoding conversion error. An error occurred while converting
text from UTF-8 to the user-defined encoding.\n\nThis is most likely because
the encoding you have chosen doesn't support the character(s) converting
to.\n\nIf you believe this is a bug, please report it to the application
author.");
msg += _("\n\nI was trying to convert to: ");
msg += App->options.encoding;
