diff --git a/ChangeLog b/ChangeLog
index 7cc5142494..854c287a92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-19  Stanislav Brabec  <utx@penguin.cz>
+
+	* plug-ins/gap/gap_lib.c: Typo fixes.
+	* po-plug-ins/POTFILES.in: Added gee_zoom.c.
+	* plug-ins/common/gee.c, plug-ins/common/gee_zoom.c: Added i18n
+	of menu item.
+
 2000-12-19  Sven Neumann  <sven@gimp.org>
 
 	* app/curves.c: applied a patch from David Hodson that reverts
@@ -189,6 +196,7 @@
 	* plug-ins/common/gee.c: Using "env" instead of "environ" caused
 	a clash. Changed the other one to "environment".
 
+>>>>>>> 1.3131
 2000-12-17  Tor Lillqvist  <tml@iki.fi>
 
 	* config.h.win32: Typo.
diff --git a/plug-ins/common/gee.c b/plug-ins/common/gee.c
index 022c6a39cb..de0306ac8b 100644
--- a/plug-ins/common/gee.c
+++ b/plug-ins/common/gee.c
@@ -109,7 +109,7 @@ query (void)
 #ifdef HIDDEN
 			 NULL,
 #else
-			 "<Image>/Filters/Toys/Gee-Slime",
+			 N_("<Image>/Filters/Toys/Gee-Slime"),
 #endif
 			 "RGB*, INDEXED*, GRAY*",
 			 GIMP_PLUGIN,
diff --git a/plug-ins/common/gee_zoom.c b/plug-ins/common/gee_zoom.c
index 288e023f28..2848f2959f 100644
--- a/plug-ins/common/gee_zoom.c
+++ b/plug-ins/common/gee_zoom.c
@@ -136,7 +136,7 @@ query (void)
 			 "Adam D. Moss <adam@gimp.org>",
 			 "Adam D. Moss <adam@gimp.org>",
 			 "1998",
-			 "<Image>/Filters/Toys/Gee-Zoom",
+			 N_("<Image>/Filters/Toys/Gee-Zoom"),
 			 "RGB*, INDEXED*, GRAY*",
 			 GIMP_PLUGIN,
 			 nargs, 0,
diff --git a/plug-ins/gap/gap_lib.c b/plug-ins/gap/gap_lib.c
index f1b42ef885..8c4fc0c421 100644
--- a/plug-ins/gap/gap_lib.c
+++ b/plug-ins/gap/gap_lib.c
@@ -718,7 +718,7 @@ int p_dir_ainfo(t_anim_info *ainfo_ptr)
    if(gap_debug) fprintf(stderr, "DEBUG p_dir_ainfo: DIRNAME:%s\n", l_dirname_ptr);
    l_dirp = opendir( l_dirname_ptr );  
    
-   if(!l_dirp) fprintf(stderr, "ERROR p_dir_ainfo: cant read directory %s\n", l_dirname_ptr);
+   if(!l_dirp) fprintf(stderr, "ERROR p_dir_ainfo: can't read directory %s\n", l_dirname_ptr);
    else
    {
      while ( (l_dp = readdir( l_dirp )) != NULL )
@@ -1254,7 +1254,7 @@ int p_save_named_frame(gint32 image_id, char *sav_name)
 	 }
          else
          {
-            fprintf(stderr, "ERROR in p_save_named_frame: cant rename %s to %s\n",
+            fprintf(stderr, "ERROR in p_save_named_frame: can't rename %s to %s\n",
                             l_tmpname, sav_name);
             return -1;
          }
@@ -2466,7 +2466,7 @@ p_clear_or_count_video_paste(gint delete_flag)
   
   if(!l_dirp)
   {
-    printf("ERROR p_vid_edit_clear: cant read directory %s\n", l_dir);
+    printf("ERROR p_vid_edit_clear: can't read directory %s\n", l_dir);
     l_framecount = -1;
   }
   else
@@ -2919,7 +2919,7 @@ p_gap_lock_is_locked(gint32 image_id, GimpRunModeType run_mode)
        {
           gchar *l_lockmsg;
        
-          l_lockmsg = g_strdup_printf(_("Cant execute more than 1 Video Function\n"
+          l_lockmsg = g_strdup_printf(_("Can't execute more than 1 Video Function\n"
                                         "on the same AnimFrame Image at the same time\n"
                                         "LOCK ID:%s\n")
                                    , l_lock.key);
diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in
index a08965183a..0f0a2d4caf 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -54,6 +54,7 @@ plug-ins/common/gauss_iir.c
 plug-ins/common/gauss_rle.c
 plug-ins/common/gbr.c
 plug-ins/common/gee.c
+plug-ins/common/gee_zoom.c
 plug-ins/common/gicon.c
 plug-ins/common/gif.c
 plug-ins/common/gih.c