Revert "Add fix_spelling_error_in_binary.diff patch"

This reverts commit ca5c3086c7ff9c99645a66fd0c21167ef60ba0e9.

Conflicts:
	debian/changelog

diff --git a/filter.c b/filter.c
index 25e8b4d7b60c76c10a7dae93cc7ea9efe4089fc8..2cb145ce9e9e0965d1d624bdeace1171b296c6f5 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -251,7 +251,7 @@ import_database()
        }
 
        if(i_read_file(filename, i_filters[filter].func ))
-               statusline_msg(_("Error occurred while opening the file"));
+               statusline_msg(_("Error occured while opening the file"));
        else if(tmp == db_n_items())
                statusline_msg(_("File does not seem to be a valid addressbook"));
 
@@ -397,7 +397,7 @@ export_database()
        }
 
        if( e_write_file(filename, e_filters[filter].func, enum_mode))
-               statusline_msg(_("Error occurred while exporting"));
+               statusline_msg(_("Error occured while exporting"));
 
        refresh_screen();
        free(filename);

diff --git a/po/abook.pot b/po/abook.pot
index 5633d03e64476bae1774ed6395ffaa58a517115f..2ab01861e67baad2cd06e1ac0f7806cc58b88c00 100644 (file)
--- a/po/abook.pot
+++ b/po/abook.pot
@@ -510,7 +510,7 @@ msgid "Filename: "
 msgstr ""
 
 #: filter.c:252
-msgid "Error occurred while opening the file"
+msgid "Error occured while opening the file"
 msgstr ""
 
 #: filter.c:254
@@ -530,7 +530,7 @@ msgid "keybindings:all/selected/cancel|asc"
 msgstr ""
 
 #: filter.c:398
-msgid "Error occurred while exporting"
+msgid "Error occured while exporting"
 msgstr ""
 
 #: filter.c:2469

diff --git a/po/de.po b/po/de.po
index d798aad41760855e638008372b5f98e9f05f11d4..b9b7cb06a28d04f0f207508fd43ad8c99aa38548 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -534,7 +534,7 @@ msgid "Filename: "
 msgstr "Dateiname: "
 
 #: filter.c:252
-msgid "Error occurred while opening the file"
+msgid "Error occured while opening the file"
 msgstr "Fehler beim Öffnen der Datei"
 
 #: filter.c:254
@@ -555,7 +555,7 @@ msgid "keybindings:all/selected/cancel|asc"
 msgstr "asc"
 
 #: filter.c:398
-msgid "Error occurred while exporting"
+msgid "Error occured while exporting"
 msgstr "Fehler beim Exportieren aufgetreten"
 
 #: filter.c:2469

diff --git a/po/fr.po b/po/fr.po
index a3b9a88f774e6f00328eda5f283456211a9b390b..fe65261206f64478a03c35ba758a47f79ae47e34 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -527,7 +527,7 @@ msgid "Filename: "
 msgstr "Nom de fichier: "
 
 #: filter.c:252
-msgid "Error occurred while opening the file"
+msgid "Error occured while opening the file"
 msgstr "Une erreur est survenue à l'ouverture du fichier"
 
 #: filter.c:254
@@ -547,7 +547,7 @@ msgid "keybindings:all/selected/cancel|asc"
 msgstr "tsa"
 
 #: filter.c:398
-msgid "Error occurred while exporting"
+msgid "Error occured while exporting"
 msgstr "Une erreur est survenue lors de l'exportation"
 
 #: filter.c:2469

diff --git a/po/sv.po b/po/sv.po
index e5885a5fe0666d1c4089c815038a38dcb598c3d3..4374cd65356825526c4a80cd2135657d11772a18 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -534,7 +534,7 @@ msgid "Filename: "
 msgstr "Filnamn:"
 
 #: filter.c:252
-msgid "Error occurred while opening the file"
+msgid "Error occured while opening the file"
 msgstr "Fel vid öppnandet av filen"
 
 #: filter.c:254
@@ -554,7 +554,7 @@ msgid "keybindings:all/selected/cancel|asc"
 msgstr ""
 
 #: filter.c:398
-msgid "Error occurred while exporting"
+msgid "Error occured while exporting"
 msgstr "Fel vid export"
 
 #: filter.c:2469