Updated Georgian translation

diff --git a/ChangeLog b/ChangeLog
index 6d8115211b8c008e90221be54c8557eb8ef4f4ff..1e2a8cd571ca7f67bf97f9f8434551b041a30db4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-20  Vladimer Sichinava  <vlsichinava@gmail.com>
+
+        * configure.in: Added "ka" (Georgian) to ALL_LINGUAS
+
+=======
 2006-03-20  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gmem.c (profiler_log): use standard_calloc to allocate
@@ -18,6 +23,7 @@
 
        * MAINTAINERS: Add this, at the request of the GNOME sysadmin team.
 
+>>>>>>> 1.2267
 2006-03-15  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (g_option_context_parse): Only set the prgname

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6d8115211b8c008e90221be54c8557eb8ef4f4ff..1e2a8cd571ca7f67bf97f9f8434551b041a30db4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-03-20  Vladimer Sichinava  <vlsichinava@gmail.com>
+
+        * configure.in: Added "ka" (Georgian) to ALL_LINGUAS
+
+=======
 2006-03-20  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gmem.c (profiler_log): use standard_calloc to allocate
@@ -18,6 +23,7 @@
 
        * MAINTAINERS: Add this, at the request of the GNOME sysadmin team.
 
+>>>>>>> 1.2267
 2006-03-15  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (g_option_context_parse): Only set the prgname

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 6d8115211b8c008e90221be54c8557eb8ef4f4ff..1e2a8cd571ca7f67bf97f9f8434551b041a30db4 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2006-03-20  Vladimer Sichinava  <vlsichinava@gmail.com>
+
+        * configure.in: Added "ka" (Georgian) to ALL_LINGUAS
+
+=======
 2006-03-20  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gmem.c (profiler_log): use standard_calloc to allocate
@@ -18,6 +23,7 @@
 
        * MAINTAINERS: Add this, at the request of the GNOME sysadmin team.
 
+>>>>>>> 1.2267
 2006-03-15  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (g_option_context_parse): Only set the prgname

diff --git a/configure.in b/configure.in
index bbad989f91783a7979d947af151a41c864cd3803..8c5144f0e8bf82f7857031a2f05d0fad2dc147e6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -427,7 +427,7 @@ dnl
 dnl gettext support
 dnl
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko ku lt lv mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sr@ije sv ta te th tl tr tt uk vi wa xh yi zh_CN zh_HK zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka ko ku lt lv mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sr@ije sv ta te th tl tr tt uk vi wa xh yi zh_CN zh_HK zh_TW"
 GLIB_GNU_GETTEXT
 
 if test "$gt_cv_have_gettext" != "yes" ; then